[Scummvm-cvs-logs] scummvm master -> 7126374b428ebb2feb7b431bdf5c906482d248dd

[Strangerke]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
7126374b42 HOPKINS: Rename the parameter of PlayAnimSound to make it meaningful


Commit: 7126374b428ebb2feb7b431bdf5c906482d248dd
    https://github.com/scummvm/scummvm/commit/7126374b428ebb2feb7b431bdf5c906482d248dd
Author: Strangerke (strangerke at scummvm.org)
Date: 2014-10-28T18:19:12+01:00

Commit Message:
HOPKINS: Rename the parameter of PlayAnimSound to make it meaningful

Changed paths:
    engines/hopkins/sound.cpp
    engines/hopkins/sound.h



diff --git a/engines/hopkins/sound.cpp b/engines/hopkins/sound.cpp
index 773c714..d86fc44 100644
--- a/engines/hopkins/sound.cpp
+++ b/engines/hopkins/sound.cpp
@@ -261,9 +261,9 @@ void SoundManager::loadAnimSound() {
 	}
 }
 
-void SoundManager::playAnimSound(int soundNumber) {
+void SoundManager::playAnimSound(int animFrame) {
 	if (!_vm->_globals->_censorshipFl && _specialSoundNum == 2) {
-		switch (soundNumber) {
+		switch (animFrame) {
 		case 20:
 			playSample(5);
 			break;
@@ -282,35 +282,35 @@ void SoundManager::playAnimSound(int soundNumber) {
 			playSample(4);
 			break;
 		}
-	} else if (_specialSoundNum == 1 && soundNumber == 17)
+	} else if (_specialSoundNum == 1 && animFrame == 17)
 		playSoundFile("SOUND42.WAV");
-	else if (_specialSoundNum == 5 && soundNumber == 19)
+	else if (_specialSoundNum == 5 && animFrame == 19)
 		playWav(1);
-	else if (_specialSoundNum == 14 && soundNumber == 625)
+	else if (_specialSoundNum == 14 && animFrame == 625)
 		playWav(1);
-	else if (_specialSoundNum == 16 && soundNumber == 25)
+	else if (_specialSoundNum == 16 && animFrame == 25)
 		playWav(1);
 	else if (_specialSoundNum == 17) {
-		if (soundNumber == 6)
+		if (animFrame == 6)
 			playSample(1);
-		else if (soundNumber == 14)
+		else if (animFrame == 14)
 			playSample(2);
-		else if (soundNumber == 67)
+		else if (animFrame == 67)
 			playSample(3);
-	} else if (_specialSoundNum == 198 && soundNumber == 15)
+	} else if (_specialSoundNum == 198 && animFrame == 15)
 		playWav(1);
-	else if (_specialSoundNum == 199 && soundNumber == 72)
+	else if (_specialSoundNum == 199 && animFrame == 72)
 		playWav(1);
-	else if (_specialSoundNum == 208 && soundNumber == 40)
+	else if (_specialSoundNum == 208 && animFrame == 40)
 		playWav(1);
-	else if (_specialSoundNum == 210 && soundNumber == 2)
+	else if (_specialSoundNum == 210 && animFrame == 2)
 		playWav(1);
-	else if (_specialSoundNum == 211 && soundNumber == 22)
+	else if (_specialSoundNum == 211 && animFrame == 22)
 		playWav(1);
 	else if (_specialSoundNum == 229) {
-		if (soundNumber == 15)
+		if (animFrame == 15)
 			playWav(1);
-		else if (soundNumber == 91)
+		else if (animFrame == 91)
 			playWav(2);
 	}
 }
diff --git a/engines/hopkins/sound.h b/engines/hopkins/sound.h
index 97cdcdc..1fb4f9a 100644
--- a/engines/hopkins/sound.h
+++ b/engines/hopkins/sound.h
@@ -116,7 +116,7 @@ public:
 	~SoundManager();
 
 	void loadAnimSound();
-	void playAnimSound(int soundNumber);
+	void playAnimSound(int animFrame);
 
 	void loadSample(int wavIndex, const Common::String &file);
 	void playSample(int wavIndex, int voiceMode = 9);