[Scummvm-cvs-logs] SF.net SVN: scummvm: [24971] scummvm/trunk/engines/sword2

[eriktorbjorn at users.sourceforge.net]

Revision: 24971
          http://scummvm.svn.sourceforge.net/scummvm/?rev=24971&view=rev
Author:   eriktorbjorn
Date:     2007-01-02 23:56:24 -0800 (Tue, 02 Jan 2007)

Log Message:
-----------
Use FRAMES_PER_SECOND, not getFramesPerSecond(), to calculate the number of
frames before a sound effect is triggered. This is not dependent on _gameSpeed.

Modified Paths:
--------------
    scummvm/trunk/engines/sword2/sound.cpp
    scummvm/trunk/engines/sword2/sword2.cpp
    scummvm/trunk/engines/sword2/sword2.h

Modified: scummvm/trunk/engines/sword2/sound.cpp
===================================================================
--- scummvm/trunk/engines/sword2/sound.cpp	2007-01-03 07:36:44 UTC (rev 24970)
+++ scummvm/trunk/engines/sword2/sound.cpp	2007-01-03 07:56:24 UTC (rev 24971)
@@ -219,7 +219,7 @@
 				// effects, however, it's the average number of
 				// seconds between playing the sound, so we
 				// have to multiply by the frame rate.
-				delay *= _vm->getFramesPerSecond();
+				delay *= FRAMES_PER_SECOND;
 			}
 
 			volume = (volume * Audio::Mixer::kMaxChannelVolume) / 16;

Modified: scummvm/trunk/engines/sword2/sword2.cpp
===================================================================
--- scummvm/trunk/engines/sword2/sword2.cpp	2007-01-03 07:36:44 UTC (rev 24970)
+++ scummvm/trunk/engines/sword2/sword2.cpp	2007-01-03 07:56:24 UTC (rev 24971)
@@ -42,8 +42,6 @@
 #include "sword2/screen.h"
 #include "sword2/sound.h"
 
-#define FRAMES_PER_SECOND 12
-
 namespace Sword2 {
 
 struct GameSettings {

Modified: scummvm/trunk/engines/sword2/sword2.h
===================================================================
--- scummvm/trunk/engines/sword2/sword2.h	2007-01-03 07:36:44 UTC (rev 24970)
+++ scummvm/trunk/engines/sword2/sword2.h	2007-01-03 07:56:24 UTC (rev 24971)
@@ -22,6 +22,8 @@
 #ifndef	SWORD2_H
 #define	SWORD2_H
 
+#define FRAMES_PER_SECOND 12
+
 // Enable this to make it possible to clear the mouse cursor luggage by
 // right-clicking. The original didn't do this, but it feels natural to me.
 // However, I'm afraid that it'll interfer badly with parts of the game, so


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