Ticket #8239: v2_mouseover.diff

scummvm/scumm/script_v2.cpp

@@ -825 +825 @@
                 vs = &_verbs[slot];
                 vs->verbid = verb;
                 vs->color = 2;
-                vs->hicolor = 0;
+                vs->hicolor = 14;
                 vs->dimcolor = 8;
                 vs->type = kTextVerbType;
                 vs->charset_nr = _string[0].t_charset;

scummvm/scumm/scumm.h

@@ -715 +715 @@
         void killVerb(int slot);
         void setVerbObject(uint room, uint object, uint verb);
 
+        void initV2MouseOver();
+        void checkV2MouseOver(ScummVM::Point pos);
         void checkV2Inventory(int x, int y);
         void redrawV2Inventory();
 

scummvm/scumm/scummvm.cpp

@@ -688 +688 @@
                         _shadowPalette[i] = i;
                 setupEGAPalette();
         }
+
+        if (_features & GF_AFTER_V2) {
+                initV2MouseOver();
+        }
         
         if (_features & GF_AFTER_V2)
                 _charset = new CharsetRendererV2(this);
@@ -1000 +1004 @@
                         drawVerb(i, 0);
                 verbMouseOver(0);
 
-                if (_features & GF_AFTER_V2)
+                if (_features & GF_AFTER_V2) {
                         redrawV2Inventory();
+                        checkV2MouseOver(_mouse);
+                }
 
                 _verbRedraw = false;
                 _fullRedraw = true;
@@ -1069 +1075 @@
                 }
                 _verbRedraw = false;
 
+                if (_features & GF_AFTER_V2)
+                        checkV2MouseOver(_mouse);
+
                 drawBlastObjects();
                 if (_features & GF_AFTER_V8)
                         processUpperActors();

scummvm/scumm/verbs.cpp

@@ -27 +27 @@
 #include "scumm.h"
 #include "verbs.h"
 
+static ScummVM::Rect v2_mouseover_boxes[7];
+static int8 v2_mouseover_box = -1;
+
+void Scumm::initV2MouseOver() {
+        int i;
+
+        v2_mouseover_box = -1;
+
+        // Inventory items
+        for (i = 0; i < 2; i++) {
+                v2_mouseover_boxes[i].left = 0;
+                v2_mouseover_boxes[i].right = 120;
+                v2_mouseover_boxes[i].top = 34 + 8 * i;
+                v2_mouseover_boxes[i].bottom = v2_mouseover_boxes[i].top + 8;
+
+                v2_mouseover_boxes[i + 2].left = 200;
+                v2_mouseover_boxes[i + 2].right = 320;
+                v2_mouseover_boxes[i + 2].top = v2_mouseover_boxes[i].top;
+                v2_mouseover_boxes[i + 2].bottom = v2_mouseover_boxes[i].bottom;
+        }
+
+        // Inventory arrows
+
+        v2_mouseover_boxes[4].left = 145;
+        v2_mouseover_boxes[4].right = 161;
+        v2_mouseover_boxes[4].top = 32;
+        v2_mouseover_boxes[4].bottom = 40;
+
+        v2_mouseover_boxes[5].left = 145;
+        v2_mouseover_boxes[5].right = 161;
+        v2_mouseover_boxes[5].top = 47;
+        v2_mouseover_boxes[5].bottom = 55;
+
+        // Sentence line
+
+        v2_mouseover_boxes[6].left = 0;
+        v2_mouseover_boxes[6].right = 320;
+        v2_mouseover_boxes[6].top = 0;
+        v2_mouseover_boxes[6].bottom = 8;
+}
+
+void Scumm::checkV2MouseOver(ScummVM::Point pos) {
+        VirtScreen *vs = &virtscr[2];
+        ScummVM::Rect rect;
+        byte *ptr, *dst;
+        int i, x, y, new_box = -1;
+
+        // Don't do anything unless the inventory is active
+        if (!(_userState & 64)) {
+                v2_mouseover_box = -1;
+                return;
+        }
+
+        if (_cursor.state > 0) {
+                for (i = 0; i < ARRAYSIZE(v2_mouseover_boxes); i++) {
+                        rect = v2_mouseover_boxes[i];
+
+                        if (rect.contains(pos.x, pos.y - vs->topline)) {
+                                new_box = i;
+                                break;
+                        }
+                }
+        }
+
+        if (new_box != v2_mouseover_box) {
+                if (v2_mouseover_box != -1) {
+                        rect = v2_mouseover_boxes[v2_mouseover_box];
+
+                        dst = ptr = vs->screenPtr + vs->xstart + rect.top * _screenWidth + rect.left;
+
+                        for (y = rect.height() - 1; y >= 0; y--) {
+                                for (x = rect.width() - 1; x >= 0; x--) {
+                                        if (dst[x] == 14)
+                                                dst[x] = 5;
+                                }
+                                dst += _screenWidth;
+                        }
+
+                        updateDirtyRect(2, rect.left, rect.right, rect.top, rect.bottom, 0);
+                }
+
+                if (new_box != -1) {
+                        rect = v2_mouseover_boxes[new_box];
+
+                        dst = ptr = vs->screenPtr + vs->xstart + rect.top * _screenWidth + rect.left;
+
+                        for (y = rect.height() - 1; y >= 0; y--) {
+                                for (x = rect.width() - 1; x >= 0; x--) {
+                                        if (dst[x] == 5)
+                                                dst[x] = 14;
+                                }
+                                dst += _screenWidth;
+                        }
+
+                        updateDirtyRect(2, rect.left, rect.right, rect.top, rect.bottom, 0);
+                }
+
+                v2_mouseover_box = new_box;
+        }
+}
+
 void Scumm::checkV2Inventory(int x, int y) {
         int object = 0;
 
@@ -64 +165 @@
         int max_inv = getInventoryCount(_scummVars[VAR_EGO]);
         ScummVM::Rect inventoryBox;
 
+        v2_mouseover_box = -1;
+
         // Clear on all invocations, so hiding works properly
         inventoryBox.top = virtscr[2].topline + 32;
         inventoryBox.bottom = virtscr[2].topline + virtscr[2].height;