libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-16 22:58:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

SHERLOCK: Fix Setup dialog button handling

Browse Source
This commit is contained in:
Paul Gilbert 2015-04-21 02:06:24 -05:00
parent 6d2bde38ec
commit a81686b0e1
3 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
engines/sherlock/sherlock.h
View File

@ -105,7 +105,6 @@ public:
Common::Point _over; // Old map position Common::Point _over; // Old map position
bool _onChessboard; bool _onChessboard;
bool _slowChess; bool _slowChess;
bool _joystick;
int _keyPadSpeed; int _keyPadSpeed;
public: public:
SherlockEngine(OSystem *syst, const SherlockGameDescription *gameDesc); SherlockEngine(OSystem *syst, const SherlockGameDescription *gameDesc);

18
engines/sherlock/user_interface.cpp
View File

@ -146,7 +146,8 @@ void Settings::drawInteface(bool flag) {
SETUP_POINTS[4][3] - screen.stringWidth(tempStr) / 2, tempStr); SETUP_POINTS[4][3] - screen.stringWidth(tempStr) / 2, tempStr);
screen.makeButton(Common::Rect(SETUP_POINTS[5][0], SETUP_POINTS[5][1], SETUP_POINTS[5][2], SETUP_POINTS[5][1] + 10), screen.makeButton(Common::Rect(SETUP_POINTS[5][0], SETUP_POINTS[5][1], SETUP_POINTS[5][2], SETUP_POINTS[5][1] + 10),
SETUP_POINTS[5][3] - screen.stringWidth("New Font Style") / 2, "New Font Style"); SETUP_POINTS[5][3] - screen.stringWidth("New Font Style") / 2, "New Font Style");
tempStr = Common::String::format("Joystick %s", SETUP_STRS0[_vm->_joystick ? 1 : 0]);
tempStr = Common::String::format("Joystick %s", SETUP_STRS0[0]);
screen.makeButton(Common::Rect(SETUP_POINTS[6][0], SETUP_POINTS[6][1], SETUP_POINTS[6][2], SETUP_POINTS[6][1] + 10), screen.makeButton(Common::Rect(SETUP_POINTS[6][0], SETUP_POINTS[6][1], SETUP_POINTS[6][2], SETUP_POINTS[6][1] + 10),
SETUP_POINTS[6][3] - screen.stringWidth(tempStr) / 2, tempStr); SETUP_POINTS[6][3] - screen.stringWidth(tempStr) / 2, tempStr);
screen.makeButton(Common::Rect(SETUP_POINTS[7][0], SETUP_POINTS[7][1], SETUP_POINTS[7][2], SETUP_POINTS[7][1] + 10), screen.makeButton(Common::Rect(SETUP_POINTS[7][0], SETUP_POINTS[7][1], SETUP_POINTS[7][2], SETUP_POINTS[7][1] + 10),
@ -221,7 +222,7 @@ int Settings::drawButtons(const Common::Point &pt, int key) {
screen.buttonPrint(Common::Point(SETUP_POINTS[idx][3], SETUP_POINTS[idx][1]), color, true, tempStr); screen.buttonPrint(Common::Point(SETUP_POINTS[idx][3], SETUP_POINTS[idx][1]), color, true, tempStr);
break; break;
case 6: case 6:
tempStr = Common::String::format("Joystick %s", SETUP_STRS0[_vm->_joystick]); tempStr = Common::String::format("Joystick %s", SETUP_STRS0[0]);
screen.buttonPrint(Common::Point(SETUP_POINTS[idx][3], SETUP_POINTS[idx][1]), color, true, tempStr); screen.buttonPrint(Common::Point(SETUP_POINTS[idx][3], SETUP_POINTS[idx][1]), color, true, tempStr);
break; break;
case 8: case 8:
@ -1793,14 +1794,17 @@ void UserInterface::doControls() {
if ((found == 5 && events._released) || _key == 'N') { if ((found == 5 && events._released) || _key == 'N') {
// New font style // New font style
screen.setFont((screen.fontNumber() + 1) & 3); int fontNum = screen.fontNumber() + 1;
if (fontNum == 3)
fontNum = 0;
screen.setFont(fontNum);
updateConfig = true;
settings.drawInteface(true);
} }
if ((found == 6 && events._released) || _key == 'J') { if ((found == 6 && events._released) || _key == 'J') {
// Toggle joystick // Toggle joystick - not implemented under ScummVM
_vm->_joystick = !_vm->_joystick;
updateConfig = true;
settings.drawInteface(true);
} }
if ((found == 7 && events._released) || _key == 'C') { if ((found == 7 && events._released) || _key == 'C') {

2
engines/sherlock/user_interface.h
View File

@ -67,7 +67,7 @@ class Settings {
private: private:
SherlockEngine *_vm; SherlockEngine *_vm;
public: public:
Settings(SherlockEngine *vm) : _vm() {} Settings(SherlockEngine *vm) : _vm(vm) {}
void drawInteface(bool flag); void drawInteface(bool flag);