diff options
| author | Paul Gilbert | 2015-06-25 20:42:02 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2015-06-25 20:42:02 -0400 |
| commit | 92ac962718b07e9b82199d39bb5ce970717da57d (patch) | |
| tree | 88e8833f5ef8d100c32cda7a0c5cd18051a2308a /engines/sherlock/tattoo | |
| parent | 66fb4b828ba841b47b3e0cd4e15e00107744f691 (diff) | |
| download | scummvm-rg350-92ac962718b07e9b82199d39bb5ce970717da57d.tar.gz scummvm-rg350-92ac962718b07e9b82199d39bb5ce970717da57d.tar.bz2 scummvm-rg350-92ac962718b07e9b82199d39bb5ce970717da57d.zip | |
SHERLOCK: RT: Further split-off of Scalpel-specific code
Diffstat (limited to 'engines/sherlock/tattoo')
| -rw-r--r-- | engines/sherlock/tattoo/tattoo.h | 5 | ||||
| -rw-r--r-- | engines/sherlock/tattoo/tattoo_user_interface.cpp | 1 | ||||
| -rw-r--r-- | engines/sherlock/tattoo/widget_inventory.cpp | 1 | ||||
| -rw-r--r-- | engines/sherlock/tattoo/widget_inventory.h | 2 |
4 files changed, 6 insertions, 3 deletions
diff --git a/engines/sherlock/tattoo/tattoo.h b/engines/sherlock/tattoo/tattoo.h index 9ef2e0a563..aa07d857c4 100644 --- a/engines/sherlock/tattoo/tattoo.h +++ b/engines/sherlock/tattoo/tattoo.h @@ -33,7 +33,10 @@ enum { INFO_TOP = 185, INFO_MIDDLE = 186, INFO_BOTTOM = 188, - MENU_BACKGROUND = 225 + MENU_BACKGROUND = 225, + COMMAND_HIGHLIGHTED = 254, + COMMAND_NULL = 193 + }; class TattooEngine : public SherlockEngine { diff --git a/engines/sherlock/tattoo/tattoo_user_interface.cpp b/engines/sherlock/tattoo/tattoo_user_interface.cpp index e3df27dfbe..ade9861c4c 100644 --- a/engines/sherlock/tattoo/tattoo_user_interface.cpp +++ b/engines/sherlock/tattoo/tattoo_user_interface.cpp @@ -587,7 +587,6 @@ void TattooUserInterface::freeMenu() { void TattooUserInterface::putMessage(const char *formatStr, ...) { Events &events = *_vm->_events; - Screen &screen = *_vm->_screen; Common::Point mousePos = events.mousePos(); // Create the string to display diff --git a/engines/sherlock/tattoo/widget_inventory.cpp b/engines/sherlock/tattoo/widget_inventory.cpp index ac30fe3c9c..fe6fa09bff 100644 --- a/engines/sherlock/tattoo/widget_inventory.cpp +++ b/engines/sherlock/tattoo/widget_inventory.cpp @@ -31,7 +31,6 @@ namespace Tattoo { #define INVENTORY_XSIZE 70 // Width of the box that surrounds inventory items #define INVENTORY_YSIZE 70 // Height of the box that surrounds inventory items -#define NUM_INVENTORY_SHOWN 8 // Number of Inventory Items Shown #define MAX_INV_COMMANDS 10 // Maximum elements in dialog // TODO: Refactor into FixedText diff --git a/engines/sherlock/tattoo/widget_inventory.h b/engines/sherlock/tattoo/widget_inventory.h index b3e914caf7..41930779bc 100644 --- a/engines/sherlock/tattoo/widget_inventory.h +++ b/engines/sherlock/tattoo/widget_inventory.h @@ -33,6 +33,8 @@ class SherlockEngine; namespace Tattoo { +#define NUM_INVENTORY_SHOWN 8 // Number of Inventory Items Shown + class WidgetInventory: public WidgetBase { private: int _invVerbMode; |