Ticket #8191: cmi-object-line2.diff

scummvm/scumm/bundle.cpp

@@ -361 +361 @@
                         return final_size;
                 }
         }
-        warning("Failed finding voice %s", name);
+        debug(2, "Failed finding voice %s", name);
         return final_size;
 }
 

scummvm/scumm/script_v8.cpp

@@ -515 +515 @@
                         }
                         pointer[j] = 0;
 
-                        // Stop any talking that's still going on
-                        if (_sound->_talkChannel > -1)
-                                _mixer->stop(_sound->_talkChannel);
+                        int new_sound = _sound->playBundleSound(pointer);
+                        if (new_sound != -1) {
+                                // Stop any talking that's still going on
+                                if (_sound->_talkChannel > -1)
+                                        _mixer->stop(_sound->_talkChannel);
+                                _sound->_talkChannel = new_sound;
+                        }
 
-                        _sound->_talkChannel = _sound->playBundleSound(pointer);
                         _messagePtr = _transText;
                 }
                 
@@ -607 +610 @@
                                 _charset->_nextTop = _charset->_top;
                         }
                 } while (c);
+
+                _blastTextQueue[i].left = _charset->_strLeft;
+                _blastTextQueue[i].right = _charset->_strRight;
+                _blastTextQueue[i].top = _charset->_strTop;
+                _blastTextQueue[i].bottom = _charset->_strBottom;
         }
         _charset->_ignoreCharsetMask = false;
 }
 
+void Scumm::removeBlastTexts() {
+        int i;
+
+        for (i = 0; i < _blastTextQueuePos; i++) {
+                restoreBG(_blastTextQueue[i].left, _blastTextQueue[i].top, _blastTextQueue[i].right, _blastTextQueue[i].bottom);
+        }
+        _blastTextQueuePos = 0;
+}
+
 void Scumm_v8::o8_mod() {
         int a = pop();
         push(pop() % a);
@@ -1614 +1631 @@
                 // scripts. Probably a wrong push/pop somewhere. For now override to correct value.
                 array = 658;
                 ArrayHeader *ah = (ArrayHeader *)getResourceAddress(rtString, readVar(array));
-                if (!strcmp((char *)ah->data, "Saveload Page"))
+                if (!strcmp((char *)ah->data, "Saveload Page") || !strcmp((char *)ah->data, "Object Names"))
                         push(1);
                 else
                         push(0);

scummvm/scumm/scumm.h

@@ -116 +116 @@
 
 struct BlastText {
         int16 xpos, ypos;
+        int16 left, right, top, bottom;
         byte color;
         byte charset;
         bool center;
@@ -876 +877 @@
 
         void enqueueText(byte *text, int x, int y, byte color, byte charset, bool center);
         void drawBlastTexts();
-        void removeBlastTexts() { _blastTextQueuePos = 0; }
+        void removeBlastTexts();
 
         void enqueueObject(int objectNumber, int objectX, int objectY, int objectWidth,
                            int objectHeight, int scaleX, int scaleY, int image, int mode);

scummvm/scumm/string.cpp

@@ -857 +857 @@
         if (_gameId == GID_CMI) {
                 if ((text[0] == '/') && (_existLanguageFile == true)) {
                         struct langIndexNode target;
-                        struct langIndexNode *found;
+                        struct langIndexNode *found = NULL;
 
                         // copy name from text /..../
                         for (l = 0; (l < 8) && (text[l + 1] != '/'); l++)
                                 target.tag[l] = toupper(text[l + 1]);
                         target.tag[l] = 0;
 
-                        found = (struct langIndexNode *)bsearch(&target, _languageIndex, _languageStrCount, sizeof(struct langIndexNode), indexCompare);
+                        // HACK: These are used for the object line when
+                        // using one object on another. I don't know if the
+                        // text in the language file is a placeholder or if
+                        // we're supposed to use it, but at least in the
+                        // English version things will work so much better if
+                        // we can't find translations for these.
 
+                        if (strcmp(target.tag, "PU_M001") != 0 && strcmp(target.tag, "PU_M002") != 0)
+                                found = (struct langIndexNode *)bsearch(&target, _languageIndex, _languageStrCount, sizeof(struct langIndexNode), indexCompare);
                         if (found != NULL) {
                                 File file;