Ticket #8243: v2-inventory.diff

scummvm/scumm/scumm.h

@@ -718 +718 @@
         // TODO: This should be moved into Scumm_v2 if posisble
         ScummVM::Rect v2_mouseover_boxes[7];
         int8 v2_mouseover_box;
+        int32 _oldV2Ego;
 
         void initV2MouseOver();
         void checkV2MouseOver(ScummVM::Point pos);
@@ -1037 +1038 @@
         bool hasCharsetMask(int left, int top, int right, int bottom);
 protected:
         void CHARSET_1();
-        void drawString(int a);
+        void drawString(int a, int max_length = 0x7FFF);
         const byte *addMessageToStack(const byte *msg);
         void addIntToStack(int var);
         void addVerbToStack(int var);

scummvm/scumm/scummvm.cpp

@@ -684 +684 @@
 
         if (_features & GF_AFTER_V2) {
                 initV2MouseOver();
+                _oldV2Ego = 0;
                 // Seems in V2 there was only a single room effect (iris),
                 // so we set that here.
                 _switchRoomEffect2 = 1;
@@ -1011 +1012 @@
                 if (_features & GF_AFTER_V2) {
                         redrawV2Inventory();
                         checkV2MouseOver(_mouse);
+                        _oldV2Ego = VAR(VAR_EGO);
                 }
 
                 _verbRedraw = false;
@@ -1078 +1080 @@
                 }
                 _verbRedraw = false;
 
-                if (_features & GF_AFTER_V2)
+                if (_features & GF_AFTER_V2) {
+                        if (_oldV2Ego != VAR(VAR_EGO)) {
+                                // FIXME: Reset and redraw the sentence line
+                                _oldV2Ego = VAR(VAR_EGO);
+                                redrawV2Inventory();
+                        }
                         checkV2MouseOver(_mouse);
+                }
 
                 drawBlastObjects();
                 if (_features & GF_AFTER_V8)

scummvm/scumm/string.cpp

@@ -336 +336 @@
         gdi._mask.extend(_charset->_str);
 }
 
-void Scumm::drawString(int a) {
+void Scumm::drawString(int a, int max_length) {
         byte buf[256];
         byte *space;
         int i;
         byte fontHeight = 0, chr;
         uint color;
+        int char_count = 0;
 
         _msgPtrToAdd = buf;
         _messagePtr = addMessageToStack(_messagePtr);
@@ -431 +432 @@
                         }
                         _charset->printChar(chr);
                         _charset->_blitAlso = false;
+                        if (++char_count >= max_length)
+                                break;
                 }
         }
 

scummvm/scumm/verbs.cpp

@@ -199 +199 @@
 
                 _messagePtr = getObjOrActorName(obj);
                 assert(_messagePtr);
-                drawString(1);
+                drawString(1, v2_mouseover_boxes[i].width() / 8);
         }
 
         // If necessary, draw "up" arrow