Use FRAMES_PER_SECOND, not getFramesPerSecond(), to calculate the number of

frames before a sound effect is triggered. This is not dependent on _gameSpeed.

svn-id: r24971

3 files changed, 3 insertions, 3 deletions

diff --git a/engines/sword2/sound.cpp b/engines/sword2/sound.cpp
index 5beff2772d..d8b6b99cea 100644
--- a/engines/sword2/sound.cpp
+++ b/engines/sword2/sound.cpp
@@ -219,7 +219,7 @@ void Sound::queueFx(int32 res, int32 type, int32 delay, int32 volume, int32 pan)
 				// 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;
diff --git a/engines/sword2/sword2.cpp b/engines/sword2/sword2.cpp
index 544c55e00a..adaeef1ba5 100644
--- a/engines/sword2/sword2.cpp
+++ b/engines/sword2/sword2.cpp
@@ -42,8 +42,6 @@
 #include "sword2/screen.h"
 #include "sword2/sound.h"
 
-#define FRAMES_PER_SECOND 12
-
 namespace Sword2 {
 
 struct GameSettings {
diff --git a/engines/sword2/sword2.h b/engines/sword2/sword2.h
index 4e7de99833..3acdce0eeb 100644
--- a/engines/sword2/sword2.h
+++ b/engines/sword2/sword2.h
@@ -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