diff options
| author | Strangerke | 2015-05-19 19:37:33 +0200 |
|---|---|---|
| committer | Strangerke | 2015-05-19 19:37:33 +0200 |
| commit | 85081b7702e7571a144ff57accd5ac9123f4123f (patch) | |
| tree | f308ab5dbeb3661cd3534359310f4a63d97ed3ba /engines/sherlock/inventory.cpp | |
| parent | 4849e008977d87b707d70c836c7abcd0c79eb9de (diff) | |
| download | scummvm-rg350-85081b7702e7571a144ff57accd5ac9123f4123f.tar.gz scummvm-rg350-85081b7702e7571a144ff57accd5ac9123f4123f.tar.bz2 scummvm-rg350-85081b7702e7571a144ff57accd5ac9123f4123f.zip | |
SHERLOCK: Systematically use InvMode values when it's appropriate
Diffstat (limited to 'engines/sherlock/inventory.cpp')
| -rw-r--r-- | engines/sherlock/inventory.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/engines/sherlock/inventory.cpp b/engines/sherlock/inventory.cpp index 63642f4e5a..265b12ce76 100644 --- a/engines/sherlock/inventory.cpp +++ b/engines/sherlock/inventory.cpp @@ -250,16 +250,16 @@ void Inventory::invCommands(bool slamIt) { if (slamIt) { screen.buttonPrint(Common::Point(INVENTORY_POINTS[0][2], CONTROLS_Y1), - _invMode == 0 ? COMMAND_HIGHLIGHTED :COMMAND_FOREGROUND, + _invMode == INVMODE_EXIT ? COMMAND_HIGHLIGHTED :COMMAND_FOREGROUND, true, "Exit"); screen.buttonPrint(Common::Point(INVENTORY_POINTS[1][2], CONTROLS_Y1), - _invMode == 1 ? COMMAND_HIGHLIGHTED :COMMAND_FOREGROUND, + _invMode == INVMODE_LOOK ? COMMAND_HIGHLIGHTED :COMMAND_FOREGROUND, true, "Look"); screen.buttonPrint(Common::Point(INVENTORY_POINTS[2][2], CONTROLS_Y1), - _invMode == 2 ? COMMAND_HIGHLIGHTED : COMMAND_FOREGROUND, + _invMode == INVMODE_USE ? COMMAND_HIGHLIGHTED : COMMAND_FOREGROUND, true, "Use"); screen.buttonPrint(Common::Point(INVENTORY_POINTS[3][2], CONTROLS_Y1), - _invMode == 3 ? COMMAND_HIGHLIGHTED : COMMAND_FOREGROUND, + _invMode == INVMODE_GIVE ? COMMAND_HIGHLIGHTED : COMMAND_FOREGROUND, true, "Give"); screen.print(Common::Point(INVENTORY_POINTS[4][2], CONTROLS_Y1 + 1), _invIndex == 0 ? COMMAND_NULL : COMMAND_FOREGROUND, @@ -273,20 +273,20 @@ void Inventory::invCommands(bool slamIt) { screen.print(Common::Point(INVENTORY_POINTS[7][2], CONTROLS_Y1 + 1), (_holdings - _invIndex <= 6) ? COMMAND_NULL : COMMAND_FOREGROUND, "__"); - if (_invMode != 1) + if (_invMode != INVMODE_LOOK) ui.clearInfo(); } else { screen.buttonPrint(Common::Point(INVENTORY_POINTS[0][2], CONTROLS_Y1), - _invMode == 0 ? COMMAND_HIGHLIGHTED : COMMAND_FOREGROUND, + _invMode == INVMODE_EXIT ? COMMAND_HIGHLIGHTED : COMMAND_FOREGROUND, false, "Exit"); screen.buttonPrint(Common::Point(INVENTORY_POINTS[1][2], CONTROLS_Y1), - _invMode == 1 ? COMMAND_HIGHLIGHTED : COMMAND_FOREGROUND, + _invMode == INVMODE_LOOK ? COMMAND_HIGHLIGHTED : COMMAND_FOREGROUND, false, "Look"); screen.buttonPrint(Common::Point(INVENTORY_POINTS[2][2], CONTROLS_Y1), - _invMode == 2 ? COMMAND_HIGHLIGHTED : COMMAND_FOREGROUND, + _invMode == INVMODE_USE ? COMMAND_HIGHLIGHTED : COMMAND_FOREGROUND, false, "Use"); screen.buttonPrint(Common::Point(INVENTORY_POINTS[3][2], CONTROLS_Y1), - _invMode == 3 ? COMMAND_HIGHLIGHTED : COMMAND_FOREGROUND, + _invMode == INVMODE_GIVE ? COMMAND_HIGHLIGHTED : COMMAND_FOREGROUND, false, "Give"); screen.gPrint(Common::Point(INVENTORY_POINTS[4][2], CONTROLS_Y1), _invIndex == 0 ? COMMAND_NULL : COMMAND_FOREGROUND, |