aboutsummaryrefslogtreecommitdiff
path: root/engines/kyra/chargen.cpp
diff options
context:
space:
mode:
authorathrxx2011-09-18 15:53:47 +0200
committerJohannes Schickel2011-12-26 16:18:15 +0100
commitac1aa43ca8b2ad9f2743006a5e40a7967a40fec5 (patch)
treea780256e5dbd68321726baea7632f34bc1afdd45 /engines/kyra/chargen.cpp
parent68ed8b95989d784fe42f4e6e400224ffb63ba80b (diff)
downloadscummvm-rg350-ac1aa43ca8b2ad9f2743006a5e40a7967a40fec5.tar.gz
scummvm-rg350-ac1aa43ca8b2ad9f2743006a5e40a7967a40fec5.tar.bz2
scummvm-rg350-ac1aa43ca8b2ad9f2743006a5e40a7967a40fec5.zip
KYRA: (EOB) - fix char generator regression + cleanup
Diffstat (limited to 'engines/kyra/chargen.cpp')
-rw-r--r--engines/kyra/chargen.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/kyra/chargen.cpp b/engines/kyra/chargen.cpp
index 0e38ffec3d..92d1b15ec3 100644
--- a/engines/kyra/chargen.cpp
+++ b/engines/kyra/chargen.cpp
@@ -380,7 +380,7 @@ int CharacterGenerator::viewDeleteCharacter() {
int res = 0;
for (bool loop = true; loop && _characters[_activeBox].name[0] && !_vm->shouldQuit(); ) {
_vm->_gui->updateBoxFrameHighLight(_activeBox + 6);
- int inputFlag =getInput(_vm->_activeButtons);
+ int inputFlag = getInput(_vm->_activeButtons);
int cbx = _activeBox;
_vm->removeInputTop();
@@ -517,7 +517,7 @@ int CharacterGenerator::classMenu(int raceSex) {
while (res == -1 && !_vm->shouldQuit()) {
updateMagicShapes();
- int in = getInput(_vm->_activeButtons) & 0xff;
+ int in = getInput(0) & 0xff;
Common::Point mp = _vm->getMousePos();
if (in == _vm->_keyMap[Common::KEYCODE_ESCAPE] || _vm->_gui->_menuLastInFlags == _vm->_keyMap[Common::KEYCODE_ESCAPE] || _vm->_gui->_menuLastInFlags == _vm->_keyMap[Common::KEYCODE_b]) {
@@ -565,7 +565,7 @@ int CharacterGenerator::alignmentMenu(int cClass) {
while (res == -1 && !_vm->shouldQuit()) {
updateMagicShapes();
- int in = getInput(_vm->_activeButtons) & 0xff;
+ int in = getInput(0) & 0xff;
Common::Point mp = _vm->getMousePos();
if (in == _vm->_keyMap[Common::KEYCODE_ESCAPE] || _vm->_gui->_menuLastInFlags == _vm->_keyMap[Common::KEYCODE_ESCAPE] || _vm->_gui->_menuLastInFlags == _vm->_keyMap[Common::KEYCODE_b]) {