thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SHERLOCK: 3DO: Fix Settings button

Browse source
This commit is contained in:
Paul Gilbert 2015-09-06 19:37:28 -04:00
parent b046479cab
commit 735bd2c3f7
2 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
engines/sherlock/scalpel/scalpel_user_interface.cpp
View file

@ -65,6 +65,7 @@ const int INVENTORY_POINTS[8][3] = {
}; };
const char COMMANDS[13] = "LMTPOCIUGJFS"; const char COMMANDS[13] = "LMTPOCIUGJFS";
const char COMMANDS_3DO[13] = "LMTPOCIUGSFF";
const char INVENTORY_COMMANDS[9] = { "ELUG-+,." }; const char INVENTORY_COMMANDS[9] = { "ELUG-+,." };
const char *const PRESS_KEY_FOR_MORE = "Press any Key for More."; const char *const PRESS_KEY_FOR_MORE = "Press any Key for More.";
const char *const PRESS_KEY_TO_CONTINUE = "Press any Key to Continue."; const char *const PRESS_KEY_TO_CONTINUE = "Press any Key to Continue.";
@ -1268,6 +1269,7 @@ void ScalpelUserInterface::doMainControl() {
ScalpelInventory &inv = *(ScalpelInventory *)_vm->_inventory; ScalpelInventory &inv = *(ScalpelInventory *)_vm->_inventory;
ScalpelSaveManager &saves = *(ScalpelSaveManager *)_vm->_saves; ScalpelSaveManager &saves = *(ScalpelSaveManager *)_vm->_saves;
Common::Point pt = events.mousePos(); Common::Point pt = events.mousePos();
const char *commands = IS_3DO ? COMMANDS_3DO : COMMANDS;
if ((events._pressed || events._released) && pt.y > CONTROLS_Y) { if ((events._pressed || events._released) && pt.y > CONTROLS_Y) {
events.clearKeyboard(); events.clearKeyboard();
@ -1282,7 +1284,7 @@ void ScalpelUserInterface::doMainControl() {
r.right += UI_OFFSET_3DO - 1; r.right += UI_OFFSET_3DO - 1;
} }
if (r.contains(pt)) if (r.contains(pt))
_key = COMMANDS[_temp]; _key = commands[_temp];
} }
--_temp; --_temp;
} else if (_keyPress) { } else if (_keyPress) {
@ -1290,8 +1292,8 @@ void ScalpelUserInterface::doMainControl() {
_keyboardInput = true; _keyboardInput = true;
if (_keyPress >= 'A' && _keyPress <= 'Z') { if (_keyPress >= 'A' && _keyPress <= 'Z') {
const char *c = strchr(COMMANDS, _keyPress); const char *c = strchr(commands, _keyPress);
_temp = !c ? 12 : c - COMMANDS; _temp = !c ? 12 : c - commands;
} else { } else {
_temp = 12; _temp = 12;
} }
@ -1393,7 +1395,7 @@ void ScalpelUserInterface::doMainControl() {
} }
break; break;
case 'S': case 'S':
pushButton(11); pushButton(IS_3DO ? 9 : 11);
_menuMode = SETUP_MODE; _menuMode = SETUP_MODE;
Settings::show(_vm); Settings::show(_vm);
break; break;

1
engines/sherlock/scalpel/scalpel_user_interface.h
View file

@ -34,6 +34,7 @@ class Talk;
namespace Scalpel { namespace Scalpel {
extern const char COMMANDS[13]; extern const char COMMANDS[13];
extern const char COMMANDS_3DO[13];
extern const int MENU_POINTS[12][4]; extern const int MENU_POINTS[12][4];
extern const int INVENTORY_POINTS[8][3]; extern const int INVENTORY_POINTS[8][3];