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

SHERLOCK: SS: Fix gcc compiler warnings

Browse source
This commit is contained in:
Paul Gilbert 2015-10-11 15:24:48 -04:00
parent 19db601fed
commit ac24e8799f
2 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

3
engines/sherlock/scalpel/scalpel_talk.cpp
View file

@ -715,7 +715,8 @@ void ScalpelTalk::drawInterface() {
screen.makeButton(Common::Rect(46, CONTROLS_Y, 273, CONTROLS_Y + 10), screen.makeButton(Common::Rect(46, CONTROLS_Y, 273, CONTROLS_Y + 10),
160 - fixedText_PressKeyToContinueLen / 2, fixedText_PressKeyToContinue); 160 - fixedText_PressKeyToContinueLen / 2, fixedText_PressKeyToContinue);
screen.gPrint(Common::Point(160 - fixedText_PressKeyToContinueLen / 2, CONTROLS_Y), COMMAND_FOREGROUND, fixedText_PressKeyToContinueHotkey.c_str()); screen.gPrint(Common::Point(160 - fixedText_PressKeyToContinueLen / 2, CONTROLS_Y), COMMAND_FOREGROUND,
"%s", fixedText_PressKeyToContinueHotkey.c_str());
} }
} }

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

@ -1946,9 +1946,8 @@ void ScalpelUserInterface::printObjectDesc(const Common::String &str, bool first
screen.makeButton(Common::Rect(46, CONTROLS_Y, 272, CONTROLS_Y + 10), screen.makeButton(Common::Rect(46, CONTROLS_Y, 272, CONTROLS_Y + 10),
(SHERLOCK_SCREEN_WIDTH - fixedText_PressKeyForMoreLen) / 2, (SHERLOCK_SCREEN_WIDTH - fixedText_PressKeyForMoreLen) / 2,
fixedText_PressKeyForMore); fixedText_PressKeyForMore);
screen.gPrint(Common::Point((SHERLOCK_SCREEN_WIDTH - screen.gPrint(Common::Point((SHERLOCK_SCREEN_WIDTH - fixedText_PressKeyForMoreLen) / 2, CONTROLS_Y),
fixedText_PressKeyForMoreLen) / 2, CONTROLS_Y), COMMAND_FOREGROUND, "%s", fixedText_PressKeyForMoreHotkey.c_str());
COMMAND_FOREGROUND, fixedText_PressKeyForMoreHotkey.c_str());
_descStr = msgP; _descStr = msgP;
} else { } else {
Common::String fixedText_PressKeyToContinue = fixedText.getText(kFixedText_PressKey_ToContinue); Common::String fixedText_PressKeyToContinue = fixedText.getText(kFixedText_PressKey_ToContinue);
@ -1958,9 +1957,8 @@ void ScalpelUserInterface::printObjectDesc(const Common::String &str, bool first
screen.makeButton(Common::Rect(46, CONTROLS_Y, 272, CONTROLS_Y + 10), screen.makeButton(Common::Rect(46, CONTROLS_Y, 272, CONTROLS_Y + 10),
(SHERLOCK_SCREEN_WIDTH - fixedText_PressKeyToContinueLen) / 2, (SHERLOCK_SCREEN_WIDTH - fixedText_PressKeyToContinueLen) / 2,
fixedText_PressKeyToContinue); fixedText_PressKeyToContinue);
screen.gPrint(Common::Point((SHERLOCK_SCREEN_WIDTH - screen.gPrint(Common::Point((SHERLOCK_SCREEN_WIDTH - fixedText_PressKeyToContinueLen) / 2, CONTROLS_Y),
fixedText_PressKeyToContinueLen) / 2, CONTROLS_Y), COMMAND_FOREGROUND, "%s", fixedText_PressKeyToContinueHotkey.c_str());
COMMAND_FOREGROUND, fixedText_PressKeyToContinueHotkey.c_str());
_descStr = ""; _descStr = "";
} }