diff options
| -rw-r--r-- | simon/items.cpp | 16 | ||||
| -rw-r--r-- | simon/simon.cpp | 3 | ||||
| -rw-r--r-- | simon/simon.h | 3 |
3 files changed, 0 insertions, 22 deletions
diff --git a/simon/items.cpp b/simon/items.cpp index cc8900269f..486411e7f4 100644 --- a/simon/items.cpp +++ b/simon/items.cpp @@ -378,9 +378,7 @@ int SimonEngine::runScript() { if (_game & GF_TALKIE) { uint speech_id = getNextWord(); if (var < 20) { - _stringid_array_3_backup[var] = _stringid_array_3[var]; _stringid_array_3[var] = string_id; - _speechid_array_4_backup[var] = _speechid_array_4[var]; _speechid_array_4[var] = speech_id; } } else { @@ -936,8 +934,6 @@ int SimonEngine::runScript() { _show_preposition = true; o_setup_cond_c(); _show_preposition = false; - if (!(_game & GF_SIMON2) && (_game & GF_TALKIE)) - _reset_arrays = true; } break; @@ -1010,18 +1006,6 @@ int SimonEngine::runScript() { talk_with_speech(speech_id, vga_sprite_id); if (string_ptr != NULL && _subtitles) talk_with_text(vga_sprite_id, color, string_ptr, tv->a, tv->b, tv->c); - - if (_reset_arrays) { - // Work around for bug in original Simon the Sorcerer 1 - // The game wouldn't reset array back to room descriptions - // after a conversation. - uint i; - for (i = 0; i < 21; i++) { - _stringid_array_3[i] = _stringid_array_3_backup[i]; - _speechid_array_4[i] = _speechid_array_4_backup[i]; - } - _reset_arrays = 0; - } } break; diff --git a/simon/simon.cpp b/simon/simon.cpp index c98c13bd95..7152934e62 100644 --- a/simon/simon.cpp +++ b/simon/simon.cpp @@ -453,10 +453,7 @@ SimonEngine::SimonEngine(GameDetector *detector, OSystem *syst) memset(_stringid_array_2, 0, sizeof(_stringid_array_2)); memset(_stringid_array_3, 0, sizeof(_stringid_array_3)); - memset(_stringid_array_3_backup, 0, sizeof(_stringid_array_3_backup)); memset(_speechid_array_4, 0, sizeof(_speechid_array_4)); - memset(_speechid_array_4_backup, 0, sizeof(_speechid_array_4_backup)); - _reset_arrays = 0; memset(_bit_array, 0, sizeof(_bit_array)); memset(_variableArray, 0, sizeof(_variableArray)); diff --git a/simon/simon.h b/simon/simon.h index d0e07c08c3..91284968cc 100644 --- a/simon/simon.h +++ b/simon/simon.h @@ -298,10 +298,7 @@ protected: uint16 _stringid_array_2[20]; uint16 _stringid_array_3[20]; - uint16 _stringid_array_3_backup[20]; uint16 _speechid_array_4[20]; - uint16 _speechid_array_4_backup[20]; - bool _reset_arrays; uint16 _bit_array[32]; int16 _variableArray[256]; |