diff options
Diffstat (limited to 'engines/lab/map.cpp')
| -rw-r--r-- | engines/lab/map.cpp | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/engines/lab/map.cpp b/engines/lab/map.cpp index a565f31d06..7256562988 100644 --- a/engines/lab/map.cpp +++ b/engines/lab/map.cpp @@ -52,8 +52,6 @@ static Image *Map, *Room, *UpArrowRoom, *DownArrowRoom, *Bridge, static uint16 MaxRooms; static MapData *Maps; -extern char *LOWERFLOORS, *MIDDLEFLOORS, *UPPERFLOORS, *MEDMAZEFLOORS, *HEDGEMAZEFLOORS, *SURMAZEFLOORS, *CARNIVALFLOOR, *SURMAZEMSG; - static uint16 MapGadX[3] = {101, 55, 8}, MapGadY[3] = {105, 105, 105}; static Gadget @@ -71,8 +69,6 @@ static GadgetList *MapGadgetList; #define SURMAZEFLOOR 6 #define CARNIVAL 7 - - static uint16 mapScaleX(uint16 x) { if (g_lab->_isHiRes) return (x - 45); @@ -80,8 +76,6 @@ static uint16 mapScaleX(uint16 x) { return ((x - 45) >> 1); } - - static uint16 mapScaleY(uint16 y) { if (g_lab->_isHiRes) return y; @@ -89,7 +83,6 @@ static uint16 mapScaleY(uint16 y) { return ((y - 35) >> 1) - (y >> 6); } - /*****************************************************************************/ /* Loads in the map data. */ /*****************************************************************************/ @@ -532,12 +525,12 @@ void LabEngine::processMap(uint16 CurRoom) { place = 1; } else { - Class = Msg->msgClass; - Code = Msg->code; - GadgetID = Msg->gadgetID; - Qualifier = Msg->qualifier; - MouseX = Msg->mouseX; - MouseY = Msg->mouseY; + Class = Msg->_msgClass; + Code = Msg->_code; + GadgetID = Msg->_gadgetID; + Qualifier = Msg->_qualifier; + MouseX = Msg->_mouseX; + MouseY = Msg->_mouseY; if (((Class == MOUSEBUTTONS) && (IEQUALIFIER_RBUTTON & Qualifier)) || ((Class == RAWKEY) && (Code == 27))) |