libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-27 04:07:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

SHERLOCK: Constants fixes in UserInterface

Browse Source
This commit is contained in:
Paul Gilbert 2015-05-20 21:02:58 -04:00
parent a57f569244
commit 6a8e317355
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
engines/sherlock/user_interface.cpp
View File

@ -682,6 +682,7 @@ void UserInterface::doEnvControl() {
Talk &talk = *_vm->_talk; Talk &talk = *_vm->_talk;
Common::Point mousePos = events.mousePos(); Common::Point mousePos = events.mousePos();
static const char ENV_COMMANDS[7] = "ELSUDQ"; static const char ENV_COMMANDS[7] = "ELSUDQ";
byte color; byte color;
_key = _oldKey = -1; _key = _oldKey = -1;
@ -710,7 +711,7 @@ void UserInterface::doEnvControl() {
// Handle selecting buttons, if any // Handle selecting buttons, if any
saves.highlightButtons(found); saves.highlightButtons(found);
if (found == 0 || found == ONSCREEN_FILES_COUNT) if (found == 0 || found == 5)
saves._envMode = SAVEMODE_NONE; saves._envMode = SAVEMODE_NONE;
} }
@ -869,7 +870,7 @@ void UserInterface::doEnvControl() {
moreKeys = _key == 'D'; moreKeys = _key == 'D';
} }
} while (saves._savegameIndex < (MAX_SAVEGAME_SLOTS - ONSCREEN_FILES_COUNT) && moreKeys); } while (saves._savegameIndex < (MAX_SAVEGAME_SLOTS - ONSCREEN_FILES_COUNT) && moreKeys);
} else if ((found == ONSCREEN_FILES_COUNT && events._released) || _key == 'Q') { } else if ((found == 5 && events._released) || _key == 'Q') {
clearWindow(); clearWindow();
screen.print(Common::Point(0, CONTROLS_Y + 20), INV_FOREGROUND, "Are you sure you wish to Quit ?"); screen.print(Common::Point(0, CONTROLS_Y + 20), INV_FOREGROUND, "Are you sure you wish to Quit ?");
screen.vgaBar(Common::Rect(0, CONTROLS_Y, SHERLOCK_SCREEN_WIDTH, CONTROLS_Y + 10), BORDER_COLOR); screen.vgaBar(Common::Rect(0, CONTROLS_Y, SHERLOCK_SCREEN_WIDTH, CONTROLS_Y + 10), BORDER_COLOR);
@ -1867,7 +1868,7 @@ void UserInterface::printObjectDesc(const Common::String &str, bool firstTime) {
// Loop through displaying up to five lines // Loop through displaying up to five lines
bool endOfStr = false; bool endOfStr = false;
const char *msgP = str.c_str(); const char *msgP = str.c_str();
for (int lineNum = 0; lineNum < 5 && !endOfStr; ++lineNum) { for (int lineNum = 0; lineNum < ONSCREEN_FILES_COUNT && !endOfStr; ++lineNum) {
int width = 0; int width = 0;
const char *lineStartP = msgP; const char *lineStartP = msgP;