diff options
Diffstat (limited to 'engines/kyra/gui_eob.cpp')
| -rw-r--r-- | engines/kyra/gui_eob.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/engines/kyra/gui_eob.cpp b/engines/kyra/gui_eob.cpp index e8e69d5b1f..e3c0743e5c 100644 --- a/engines/kyra/gui_eob.cpp +++ b/engines/kyra/gui_eob.cpp @@ -1460,7 +1460,7 @@ void GUI_EoB::processButton(Button *button) { // nullsub (at least EOBII) } else if (button->data0Val1 == 4) { if (button->data1Callback) - (*button->data1Callback.get())(button); + (*button->data1Callback)(button); } } else if (button->data1Val1 == 2) { if (!(button->flags2 & 4)) @@ -1469,7 +1469,7 @@ void GUI_EoB::processButton(Button *button) { // nullsub (at least EOBII) } else if (button->data1Val1 == 4) { if (button->data1Callback) - (*button->data1Callback.get())(button); + (*button->data1Callback)(button); } } @@ -1486,7 +1486,7 @@ void GUI_EoB::processButton(Button *button) { // nullsub (at least EOBII) } else if (button->data0Val1 == 4) { if (button->data2Callback) - (*button->data2Callback.get())(button); + (*button->data2Callback)(button); } } else if (button->data2Val1 == 2) { _screen->drawBox(sx, sy, fx2, fy2, (button->flags2 & 1) ? button->data3Val2 : button->data2Val2); @@ -1494,7 +1494,7 @@ void GUI_EoB::processButton(Button *button) { // nullsub (at least EOBII) } else if (button->data2Val1 == 4) { if (button->data2Callback) - (*button->data2Callback.get())(button); + (*button->data2Callback)(button); } } @@ -1507,7 +1507,7 @@ void GUI_EoB::processButton(Button *button) { // nullsub (at least EOBII) } else if (button->data0Val1 == 4) { if (button->data0Callback) - (*button->data0Callback.get())(button); + (*button->data0Callback)(button); } else if (button->data0Val1 == 5) { _screen->drawBox(sx, sy, fx2, fy2, button->data0Val2); } else { @@ -1876,7 +1876,7 @@ int GUI_EoB::processButtonList(Kyra::Button *buttonList, uint16 inputFlags, int8 processButton(buttonList); if (v6 && buttonList->buttonCallback) - runLoop = ((*buttonList->buttonCallback.get())(buttonList)) ? false : true; + runLoop = !(*buttonList->buttonCallback)(buttonList); if ((flgs2 & 2) && (flgs & 0x20)) runLoop = false; @@ -2331,7 +2331,7 @@ bool GUI_EoB::confirmDialogue2(int dim, int id, int deflt) { _screen->setFont(of); _screen->setScreenDim(od); - return newHighlight ? false : true; + return newHighlight == 0; } void GUI_EoB::messageDialogue(int dim, int id, int buttonTextCol) { @@ -3548,7 +3548,7 @@ bool GUI_EoB::confirmDialogue(int id) { _vm->removeInputTop(); if (inputFlag == _vm->_keyMap[Common::KEYCODE_KP5] || inputFlag == _vm->_keyMap[Common::KEYCODE_SPACE] || inputFlag == _vm->_keyMap[Common::KEYCODE_RETURN]) { - result = lastHighlight ? false : true; + result = lastHighlight == 0; inputFlag = 0x8021 + lastHighlight; runLoop = false; } else if (inputFlag == _vm->_keyMap[Common::KEYCODE_KP4] || inputFlag == _vm->_keyMap[Common::KEYCODE_LEFT] || inputFlag == _vm->_keyMap[Common::KEYCODE_KP6] || inputFlag == _vm->_keyMap[Common::KEYCODE_RIGHT]) { |