From d9dce1f981a4f463dffd30a9583f038b86c62543 Mon Sep 17 00:00:00 2001 From: driAn Date: Mon, 2 Jun 2008 19:07:33 +0000 Subject: [PATCH] tinnitus volume fix git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@2145 e016b1c5-ed68-44aa-a2f7-31cac88cffde --- source/src/sound.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/src/sound.cpp b/source/src/sound.cpp index f8a850f5..55a7b414 100644 --- a/source/src/sound.cpp +++ b/source/src/sound.cpp @@ -841,7 +841,7 @@ void checkplayerloopsounds() updateloopsound(S_UNDERWATER, alive && player1->inwater); // tinnitus bool tinnitus = alive && player1->eardamagemillis>0 && lastmillis<=player1->eardamagemillis; - float tinnitusvol = tinnitus ? 1.0f-(player1->eardamagemillis-lastmillis/250.0f) : 1.0f; + float tinnitusvol = tinnitus && player1->eardamagemillis-lastmillis<=1000 ? (player1->eardamagemillis-lastmillis)/1000.0f : 1.0f; updateloopsound(S_TINNITUS, tinnitus, tinnitusvol); }