[Scummvm-cvs-logs] SF.net SVN: scummvm:[45227] scummvm/trunk/engines/kyra

athrxx at users.sourceforge.net athrxx at users.sourceforge.net
Sun Oct 18 19:28:00 CEST 2009


Revision: 45227
          http://scummvm.svn.sourceforge.net/scummvm/?rev=45227&view=rev
Author:   athrxx
Date:     2009-10-18 17:28:00 +0000 (Sun, 18 Oct 2009)

Log Message:
-----------
LOL: - added some updateInputs to spell animation code
- improved sfx volume code

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/lol.cpp
    scummvm/trunk/engines/kyra/sound_lol.cpp

Modified: scummvm/trunk/engines/kyra/lol.cpp
===================================================================
--- scummvm/trunk/engines/kyra/lol.cpp	2009-10-18 16:59:33 UTC (rev 45226)
+++ scummvm/trunk/engines/kyra/lol.cpp	2009-10-18 17:28:00 UTC (rev 45227)
@@ -3216,18 +3216,20 @@
 				if (del) {
 					delay(step);
 					del -= step;
+				} else {
+					updateInput();
 				}
 				continue;
 			}
 
-			if (!_screen->fadePaletteStep(pal1, pal2, _system->getMillis() - startTime, _tickLength * fadeDelay) && !mov) {
-				updateInput();
+			if (!_screen->fadePaletteStep(pal1, pal2, _system->getMillis() - startTime, _tickLength * fadeDelay) && !mov)
 				return;
-			}
 
 			if (del) {
 				delay(step);
 				del -= step;
+			} else {
+				updateInput();
 			}
 		} while (del);
 

Modified: scummvm/trunk/engines/kyra/sound_lol.cpp
===================================================================
--- scummvm/trunk/engines/kyra/sound_lol.cpp	2009-10-18 16:59:33 UTC (rev 45226)
+++ scummvm/trunk/engines/kyra/sound_lol.cpp	2009-10-18 17:28:00 UTC (rev 45227)
@@ -167,16 +167,12 @@
 	if (track == -1)
 		return;
 
+	volume &= 0xff;
 	int16 volIndex = (int16)READ_LE_UINT16(&_ingameSoundIndex[track * 2 + 1]);
 
-	if (volIndex > 0)
-		volume = (volIndex * volume) >> 8;
-	else if (volIndex < 0)
-		volume = -volIndex;
+	volume = (volIndex > 0) ? (volIndex * volume) >> 8 : -volIndex;
+	volume = CLIP(volume >> 4, 2, 13) * 7 + 164;
 
-	// volume TODO
-	volume = 254 - volume;
-
 	int16 vocIndex = (int16)READ_LE_UINT16(&_ingameSoundIndex[track * 2]);
 
 	bool hasVocFile = false;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




More information about the Scummvm-git-logs mailing list