[Scummvm-cvs-logs] CVS: scummvm/simon items.cpp,1.86,1.87 simon.cpp,1.257,1.258 simon.h,1.80,1.81

[Travis Howell]

Update of /cvsroot/scummvm/scummvm/simon
In directory sc8-pr-cvs1:/tmp/cvs-serv7621/simon

Modified Files:
	items.cpp simon.cpp simon.h 
Log Message:

Rename variable


Index: items.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/items.cpp,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -d -r1.86 -r1.87
--- items.cpp	21 Jul 2003 04:00:04 -0000	1.86
+++ items.cpp	21 Jul 2003 09:11:21 -0000	1.87
@@ -1049,12 +1049,12 @@
 		case 185:{									/* midi sfx file number */
 				if (_game & GF_SIMON2)
 					goto invalid_opcode;
-					_midi_sfx = getVarOrWord();
+					_sound_file_id = getVarOrWord();
 				if (_game == GAME_SIMON1CD32) {
 					char buf[10];
-					sprintf(buf, "%d%s", _midi_sfx, "Effects");
+					sprintf(buf, "%d%s", _sound_file_id, "Effects");
 					_sound->readSfxFile(buf, _gameDataPath);
-					sprintf(buf, "%d%s", _midi_sfx, "simon");
+					sprintf(buf, "%d%s", _sound_file_id, "simon");
 					_sound->readVoiceFile(buf, _gameDataPath);
 				}
 

Index: simon.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.cpp,v
retrieving revision 1.257
retrieving revision 1.258
diff -u -d -r1.257 -r1.258
--- simon.cpp	21 Jul 2003 04:00:04 -0000	1.257
+++ simon.cpp	21 Jul 2003 09:11:21 -0000	1.258
@@ -346,7 +346,7 @@
 	_skip_speech = 0;
 	_video_var_9 = 0;
 
-	_midi_sfx = 0;
+	_sound_file_id = 0;
 	_last_music_played = -1;
 	_next_music_to_play = -1;
 
@@ -1107,7 +1107,7 @@
 	File mus_file;
 	uint16 mus_offset;
 
-	sprintf(filename, "STINGS%i.MUS", _midi_sfx);
+	sprintf(filename, "STINGS%i.MUS", _sound_file_id);
 	mus_file.open(filename, _gameDataPath);
 	if (!mus_file.isOpen()) {
 		warning("Can't load sound effect from '%s'", filename);

Index: simon.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.h,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -d -r1.80 -r1.81
--- simon.h	15 Jul 2003 16:40:24 -0000	1.80
+++ simon.h	21 Jul 2003 09:11:21 -0000	1.81
@@ -249,7 +249,7 @@
 	bool _skip_speech;
 	byte _video_var_9;
 
-	uint _midi_sfx;
+	uint _sound_file_id;
 	int16 _last_music_played;
 	int16 _next_music_to_play;