Ticket #8788: zanthiaTalk.patch

kyra_v2.cpp

@@ -1871 +1871 @@
                 Opcode(o2_dummy),
                 OpcodeUnImpl(),
                 // 0x80
+                Opcode(o2_objectChat),
                 OpcodeUnImpl(),
                 OpcodeUnImpl(),
                 OpcodeUnImpl(),
-                OpcodeUnImpl(),
                 // 0x84
                 OpcodeUnImpl(),
                 OpcodeUnImpl(),

kyra_v2.h

@@ -615 +615 @@
         byte _messagePal[3];
         int _msgUnk1;
 
+        uint8 _configTextspeed;
+
         // chat
         int _vocHigh;
 
@@ -630 +632 @@
         int chatGetType(const char *text);
         int chatCalcDuration(const char *text);
 
-        void objectChat(const char *text, int object, int vocHigh, int vocLow);
-        void objectChatInit(const char *text, int object, int vocHigh, int vocLow);
+        void objectChat(const char *text, int object, int vocHigh = -1, int vocLow = -1);
+        void objectChatInit(const char *text, int object, int vocHigh = -1, int vocLow = -1);
         void objectChatPrintText(const char *text, int object);
         void objectChatProcess(const char *script);
         void objectChatWaitToFinish();
@@ -792 +794 @@
         int o2_defineSceneAnim(ScriptState *script);
         int o2_updateSceneAnim(ScriptState *script);
         int o2_defineRoom(ScriptState *script);
+        int o2_objectChat(ScriptState *script);
         int o2_countItemInstances(ScriptState *script);
         int o2_initObject(ScriptState *script);
         int o2_deinitObject(ScriptState *script);

script_v2.cpp

@@ -644 +644 @@
         return 0;
 }
 
+int KyraEngine_v2::o2_objectChat(ScriptState *script) {
+        debugC(3, kDebugLevelScriptFuncs, "o2_objectChat(%p) ('%s', %d)", (const void *)script, stackPosString(0), stackPos(1));
+        objectChat(stackPosString(0), stackPos(1));
+        return 0;
+}
+
 int KyraEngine_v2::o2_countItemInstances(ScriptState *script) {
         debugC(3, kDebugLevelScriptFuncs, "o2_countItemInstances(%p) (%d)", (const void *)script, stackPos(0));
         uint16 item = stackPos(0);
@@ -823 +829 @@
 
 int KyraEngine_v2::o2t_setShapeFlag(ScriptState *script) {
         debugC(3, kDebugLevelScriptFuncs, "o2t_setShapeFlag(%p) (%d)", (const void *)script, stackPos(0));
-        _newShapeFlag = stackPos(0);
+        if (_flags.isTalkie)
+                _newShapeFlag = stackPos(0);
         return 0;
 }
 

text_v2.cpp

@@ -126 +126 @@
 }
 
 int KyraEngine_v2::chatCalcDuration(const char *str) {
-        return MIN<int>(strlen(str) << 3, 120);
+        // TODO: text speed support     
+        _configTextspeed = 50;
+
+        static const uint8 duration[] = { 16, 14, 12, 10, 8, 8, 7, 6, 5, 4 };
+        return MAX<int>(strlen(str) * duration[(_configTextspeed / 10)], 120);
 }
 
 void KyraEngine_v2::objectChat(const char *str, int object, int vocHigh, int vocLow) {
@@ -318 +322 @@
                         }
 
                         const uint32 curTime = _system->getMillis();
-                        if ((1/*textEnabled()*/ && curTime > endTime) || (1/*voiceEnabled()*/ && !snd_voiceIsPlaying()) || _skipFlag) {
+                        if ((1/*textEnabled()*/ && curTime > endTime) || (_flags.isTalkie && 1/*voiceEnabled()*/ && !snd_voiceIsPlaying()) || _skipFlag) {
                                 _skipFlag = false;
                                 nextFrame = curTime;
                                 running = false;