Ticket #8244: simon.2.patch

simon/items.cpp

@@ -995 +995 @@
                                 if (_game & GF_TALKIE) 
                                         d = _array_4[a];
 
-                                if (d != 0 && !_subtitles) {
+                                if (d != 0)
                                         talk_with_speech(d, b);
-                                } else if (s != NULL) {
+                                if (s != NULL && (d == 0 || _subtitles))
                                         talk_with_text(b, c, s, tv->a, tv->b, tv->c);
-                                }
                         }
                         break;
 
@@ -1234 +1233 @@
         if (_game == GAME_SIMON1CD32 || _game == GAME_SIMON1TALKIE || _game == GAME_SIMON1WIN) {
                 if (child != NULL && child->avail_props & 0x200) {
                         uint offs = getOffsetOfChild2Param(child, 0x200);
-                        if (!_subtitles)
-                                talk_with_speech(child->array[offs], a);
+                        talk_with_speech(child->array[offs], a);
                 } else if (child != NULL && child->avail_props & 0x100) {
                         uint offs = getOffsetOfChild2Param(child, 0x100);
-                        if (!_subtitles)
-                                talk_with_speech(child->array[offs] + 3550, a);
+                        talk_with_speech(child->array[offs] + 3550, a);
                 }
         } else if (_game == GAME_SIMON2TALKIE || _game == GAME_SIMON2WIN) {
                 if (child != NULL && child->avail_props & 0x200) {
@@ -1289 +1286 @@
                                 }
                         }
 
-                        if (!_subtitles)
-                                talk_with_speech(var200, a);
+                        talk_with_speech(var200, a);
                 }
 
         }

simon/simon.cpp

@@ -245 +245 @@
         _continous_mainscript = 0;
         _continous_vgascript = 0;
         _draw_images_debug = 0;
-        _subtitles = 0;
+        _subtitles = true;
         _mouse_cursor = 0;
         _vga_var9 = 0;
         _script_unk_1 = 0;
@@ -430 +430 @@
         _debugMode = detector->_debugMode;
         _debugLevel = detector->_debugLevel;
         _language = detector->_language;
+        _noSubtitles = detector->_noSubtitles;
 }
 
 SimonEngine::~SimonEngine() {
@@ -2037 +2038 @@
         case GAME_SIMON1TALKIE:
         case GAME_SIMON1WIN:
         case GAME_SIMON1CD32:
-                if (speech_id != 0 && !_subtitles) {
+                if (speech_id != 0)
                         talk_with_speech(speech_id, num_1);
-                } else if (string_ptr != NULL) {
+                if (string_ptr != NULL && _subtitles)
                         talk_with_text(num_1, num_2, (const char *)string_ptr, tv->a, tv->b, tv->c);
-                }
                 break;
 
         case GAME_SIMON1DEMO:
@@ -2054 +2054 @@
         case GAME_SIMON2TALKIE:
         case GAME_SIMON2WIN:
         case GAME_SIMON2MAC:
-                if (speech_id != 0 && num_1 == 1 && !_subtitles)
+                if (speech_id != 0 && num_1 == 1)
                         talk_with_speech(speech_id, num_1);
 
                 if (speech_id != 0 && !_subtitles)
@@ -2729 +2729 @@
         _exit_cutscene = false;
         _skip_speech = false;
         while (_vga_wait_for != 0) {
-                if (_skip_speech) {
-                        if (_game & GF_SIMON2) {
-                                if (_vga_wait_for == 200 && !vc_get_bit(14)) {
-                                        skip_speech();
-                                        break;
-                                }
+                if (_skip_speech && _game & GF_SIMON2) {
+                        if (_vga_wait_for == 200 && !vc_get_bit(14)) {
+                                skip_speech();
+                                break;
                         }
                 } else if (_exit_cutscene) {
                         if (vc_get_bit(9)) {
@@ -3742 +3740 @@
 void SimonEngine::talk_with_speech(uint speech_id, uint num_1) {
         if (!(_game & GF_SIMON2)) {
                 if (speech_id == 9999) {
+                        if (_subtitles)
+                                return;
                         if (!(_bit_array[0] & 0x4000) && !(_bit_array[1] & 0x1000)) {
                                 _bit_array[0] |= 0x4000;
                                 _variableArray[100] = 0xF;
@@ -3749 +3749 @@
                                 o_wait_for_vga(0x82);
                         }
                         _skip_vga_wait = true;
-                        return;
-                }
-                if (num_1 < 100) {
+                } else {
+                        if (_subtitles && _scriptvar_2) {
+                                start_vga_code(4, 2, 204, 0, 0, 0);
+                                o_wait_for_vga(204);
+                                o_kill_sprite_simon1(204);
+                        }
                         o_kill_sprite_simon1(num_1 + 201);
-                }
-
-                _sound->playVoice(speech_id);
-
-                if (num_1 < 100) {
+                        _sound->playVoice(speech_id);
                         start_vga_code(4, 2, num_1 + 201, 0, 0, 0);
                 }
         } else {
@@ -3779 +3778 @@
                         }
                         o_kill_sprite_simon2(2, num_1 + 2);
                         _sound->playVoice(speech_id);
-
                         start_vga_code(4, 2, num_1 + 2, 0, 0, 0);
                 }
         }
@@ -4395 +4393 @@
         if (_debugLevel == 4)
                 _start_mainscript = true;
 
-        if (_sound->hasVoice()) {
+        if (_game & GF_TALKIE)
+                if (_noSubtitles)
+                        _subtitles = false;
+
+        if (!(_sound->hasVoice()))
                 _subtitles = false;
-        } else {
-                _subtitles = true;
-        }
 
         if (_language == 4 || (_language > 5 && _language < 20))
                 error("Only English, French, German, Hebrew, Italian and Spanish are supported");
 
-        //Only English and German voice files were produced
-        if  (_language >= 2)
-                _subtitles = true;
-
         while (1) {
                 hitarea_stuff();
                 handle_verb_clicked(_verb_hitarea);
@@ -4482 +4477 @@
 
                                 case OSystem::EVENT_RBUTTONDOWN:
                                         if (_game & GF_SIMON2)
-                                        _skip_speech = true;
+                                                _skip_speech = true;
                                         else
-                                        _exit_cutscene = true;
-                                        break;
+                                                _exit_cutscene = true;
+                                        break;
                                 
                                 default:
                                         break;

simon/simon.h

@@ -186 +186 @@
         uint16 _debugMode;
         uint16 _debugLevel;
         uint16 _language;
+        bool _noSubtitles;
         bool _start_mainscript;
         bool _continous_mainscript;
         bool _continous_vgascript;