Ticket #3075: actorToPrintStrFor_V8.diff

scumm/actor.cpp

@@ -1861 +1861 @@
         }
         if (_actorToPrintStrFor == 0xFF) {
                 setTalkingActor(0xFF);
+                _charsetColor = _string[0].color;
         } else {
                 a = derefActor(_actorToPrintStrFor, "actorTalk");
                 setTalkingActor(a->_number);
                 if (!_string[0].no_talk_anim) {
                         a->runActorTalkScript(a->_talkStartFrame);
-                        _useTalkAnims = true;
                 }
-        }
-
-        if (getTalkingActor() > 0x7F) {
-                _charsetColor = (byte)_string[0].color;
-        } else {
-                a = derefActor(getTalkingActor(), "actorTalk(2)");
                 _charsetColor = a->_talkColor;
         }
+
         _charsetBufPos = 0;
         _talkDelay = 0;
         _haveMsg = 1;
@@ -1987 +1982 @@
                         a->runActorTalkScript(a->_talkStopFrame);
                         _useTalkAnims = false;
                 }
-                if (_game.version <= 7 && _game.heversion == 0)
+                if (_game.heversion == 0)
                         setTalkingActor(0xFF);
                 a->_heTalking = false;
         }
-        if (_game.version == 8 || _game.heversion >= 60)
+        if (_game.heversion >= 60)
                 setTalkingActor(0);
         if (_game.version == 8)
                 VAR(VAR_HAVE_MSG) = 0;

scumm/script_v8.cpp

@@ -466 +466 @@
         switch (b) {
         case 0xC8:              // SO_PRINT_BASEOP
                 _string[m].loadDefault();
-                if (n)
+                if (n) {
                         _actorToPrintStrFor = pop();
+                        // original V8 interpreter uses 0, whereas the existing talking code expects 0xFF
+                        if (_actorToPrintStrFor == 0)
+                                _actorToPrintStrFor = 0xFF;
+                }
                 break;
         case 0xC9:              // SO_PRINT_END
                 _string[m].saveDefault();