diff options
| -rw-r--r-- | simon/items.cpp | 6 | ||||
| -rw-r--r-- | simon/simon.cpp | 4 | ||||
| -rw-r--r-- | simon/simon.h | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/simon/items.cpp b/simon/items.cpp index 6b294b72aa..8dcfacdc35 100644 --- a/simon/items.cpp +++ b/simon/items.cpp @@ -1049,12 +1049,12 @@ int SimonEngine::runScript() { 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); } diff --git a/simon/simon.cpp b/simon/simon.cpp index 10fb7a7ef6..9b82f39f66 100644 --- a/simon/simon.cpp +++ b/simon/simon.cpp @@ -346,7 +346,7 @@ SimonEngine::SimonEngine(GameDetector *detector, OSystem *syst) _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 @@ void SimonEngine::playSting(uint a) { 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); diff --git a/simon/simon.h b/simon/simon.h index 6f1d698b4d..ac0e7515e5 100644 --- a/simon/simon.h +++ b/simon/simon.h @@ -249,7 +249,7 @@ protected: bool _skip_speech; byte _video_var_9; - uint _midi_sfx; + uint _sound_file_id; int16 _last_music_played; int16 _next_music_to_play; |