From f0abb4f6560aadd824855f97ca31186f6df94023 Mon Sep 17 00:00:00 2001 From: Strangerke Date: Sun, 1 Jul 2012 00:59:06 +0200 Subject: LILLIPUT: Some renaming --- engines/lilliput/lilliput.cpp | 24 ++++++++++++------------ engines/lilliput/lilliput.h | 4 ++-- engines/lilliput/script.cpp | 10 +++++----- engines/lilliput/script.h | 2 +- 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/engines/lilliput/lilliput.cpp b/engines/lilliput/lilliput.cpp index be9f42ead3..945fa87d63 100644 --- a/engines/lilliput/lilliput.cpp +++ b/engines/lilliput/lilliput.cpp @@ -134,7 +134,7 @@ LilliputEngine::LilliputEngine(OSystem *syst, const LilliputGameDescription *gd) _soundHandler = new LilliputSound(this); _handleOpcodeReturnCode = 0; - _mouthSelected = false; + _delayedReactivationAction = false; _selectedCharacterId = -1; _numCharactersToDisplay = 0; _nextDisplayCharacterPos = Common::Point(0, 0); @@ -1914,8 +1914,8 @@ void LilliputEngine::sub13156(bool &forceReturnFl) { } } -void LilliputEngine::sub147D7() { - debugC(2, kDebugEngine, "sub147D7()"); +void LilliputEngine::checkNumericCode() { + debugC(2, kDebugEngine, "checkNumericCode()"); static bool altKeyFl = false; static int16 keyCount = 0; @@ -1974,7 +1974,7 @@ void LilliputEngine::sub147D7() { void LilliputEngine::handleGameMouseClick() { debugC(2, kDebugEngine, "handleGameMouseClick()"); - sub147D7(); + checkNumericCode(); bool forceReturnFl = false; sub13156(forceReturnFl); @@ -2045,7 +2045,7 @@ void LilliputEngine::checkClickOnCharacter(Common::Point pos, bool &forceReturnF if ((pos.x >= _characterDisplayX[i]) && (pos.x <= _characterDisplayX[i] + 17) && (pos.y >= _characterDisplayY[i]) && (pos.y <= _characterDisplayY[i] + 17) && (i != _word10804)) { _selectedCharacterId = i; _actionType = kActionGoto; - if (_mouthSelected) + if (_delayedReactivationAction) _actionType = kActionTalk; forceReturnFl = true; @@ -2086,7 +2086,7 @@ void LilliputEngine::sub1305C(byte index, byte button) { _lastInterfaceHotspotButton = button; if (button == 2) { - if (!_mouthSelected) { + if (!_delayedReactivationAction) { _scriptHandler->_interfaceHotspotStatus[index] = kHotspotEnabled; _actionType = 2; displayInterfaceHotspots(); @@ -2094,7 +2094,7 @@ void LilliputEngine::sub1305C(byte index, byte button) { return; } - if (_mouthSelected) { + if (_delayedReactivationAction) { unselectInterfaceButton(); return; } @@ -2102,7 +2102,7 @@ void LilliputEngine::sub1305C(byte index, byte button) { unselectInterfaceHotspots(); _scriptHandler->_interfaceHotspotStatus[index] = kHotspotSelected; if (_rulesBuffer13_1[index] == 1) { - _mouthSelected = true; + _delayedReactivationAction = true; _bool15AC2 = true; } else { _actionType = 1; @@ -2555,7 +2555,7 @@ byte *LilliputEngine::loadRaw(Common::String filename, int filesize) { void LilliputEngine::loadRules() { debugC(1, kDebugEngine, "loadRules()"); - static const Common::KeyCode _rulesXlatArray[26] = { + static const Common::KeyCode keybMappingArray[26] = { Common::KEYCODE_a, Common::KEYCODE_b, Common::KEYCODE_c, Common::KEYCODE_d, Common::KEYCODE_e, Common::KEYCODE_f, Common::KEYCODE_g, Common::KEYCODE_h, Common::KEYCODE_i, Common::KEYCODE_j, Common::KEYCODE_k, Common::KEYCODE_l, Common::KEYCODE_m, Common::KEYCODE_n, Common::KEYCODE_o, @@ -2732,7 +2732,7 @@ void LilliputEngine::loadRules() { _keyboardMapping[i] = Common::KEYCODE_INVALID; // 0xB4; ? else { assert((curByte > 0x40) && (curByte <= 0x41 + 26)); - _keyboardMapping[i] = _rulesXlatArray[curByte - 0x41]; + _keyboardMapping[i] = keybMappingArray[curByte - 0x41]; } } f.close(); @@ -2794,7 +2794,7 @@ void LilliputEngine::setCurrentCharacter(int index) { void LilliputEngine::unselectInterfaceButton() { debugC(1, kDebugEngine, "unselectInterfaceButton()"); - _mouthSelected = false; + _delayedReactivationAction = false; _bool15AC2 = false; _lastInterfaceHotspotButton = 0; unselectInterfaceHotspots(); @@ -2807,7 +2807,7 @@ void LilliputEngine::handleMenu() { if (_actionType == kActionNone) return; - if (_mouthSelected && (_actionType != kActionTalk)) + if (_delayedReactivationAction && (_actionType != kActionTalk)) return; setCurrentCharacter(_word10804); diff --git a/engines/lilliput/lilliput.h b/engines/lilliput/lilliput.h index ca2d3fd246..2ea4a5705d 100644 --- a/engines/lilliput/lilliput.h +++ b/engines/lilliput/lilliput.h @@ -273,7 +273,7 @@ public: void renderCharacters(byte *buf, Common::Point pos); - void sub147D7(); + void checkNumericCode(); void sub13156(bool &forceReturnFl); byte sub16799(int index, Common::Point param1); byte getDirection(Common::Point param1, Common::Point param2); @@ -347,7 +347,7 @@ public: int _skipDisplayFlag2; byte _actionType; - bool _mouthSelected; + bool _delayedReactivationAction; int8 _selectedCharacterId; byte _numCharactersToDisplay; int16 _word10804; diff --git a/engines/lilliput/script.cpp b/engines/lilliput/script.cpp index f868d864e2..e6e4df22b9 100644 --- a/engines/lilliput/script.cpp +++ b/engines/lilliput/script.cpp @@ -220,7 +220,7 @@ byte LilliputScript::handleOpcodeType1(int curWord) { return OC_checkSelectedCharacter(); break; case 0x2D: - return OC_sub179AE(); + return OC_checkDelayedReactivation(); break; case 0x2E: return OC_sub179C2(); @@ -601,7 +601,7 @@ static const OpCode opCodes1[] = { { "OC_sub1796E", 2, kGetValue1, kImmediateValue, kNone, kNone, kNone }, { "OC_checkLastInterfaceHotspotIndex", 2, kImmediateValue, kImmediateValue, kNone, kNone, kNone }, { "OC_checkSelectedCharacter", 0, kNone, kNone, kNone, kNone, kNone }, - { "OC_sub179AE", 0, kNone, kNone, kNone, kNone, kNone }, + { "OC_checkDelayedReactivation", 0, kNone, kNone, kNone, kNone, kNone }, { "OC_sub179C2", 1, kgetPosFromScript, kNone, kNone, kNone, kNone }, { "OC_checkFunctionKeyPressed", 1, kImmediateValue, kNone, kNone, kNone, kNone }, { "OC_checkCodeEntered", 3, kImmediateValue, kImmediateValue, kImmediateValue, kNone, kNone }, @@ -2036,10 +2036,10 @@ byte LilliputScript::OC_checkSelectedCharacter() { return 1; } -byte LilliputScript::OC_sub179AE() { - debugC(1, kDebugScript, "OC_sub179AE()"); +byte LilliputScript::OC_checkDelayedReactivation() { + debugC(1, kDebugScript, "OC_checkDelayedReactivation()"); - if (_vm->_mouthSelected || (_vm->_selectedCharacterId == -1)) + if (_vm->_delayedReactivationAction || (_vm->_selectedCharacterId == -1)) return 0; return 1; diff --git a/engines/lilliput/script.h b/engines/lilliput/script.h index c8744a57fa..240da58608 100644 --- a/engines/lilliput/script.h +++ b/engines/lilliput/script.h @@ -194,7 +194,7 @@ private: byte OC_checkCharacterDirection(); byte OC_checkLastInterfaceHotspotIndex(); byte OC_checkSelectedCharacter(); - byte OC_sub179AE(); + byte OC_checkDelayedReactivation(); byte OC_sub179C2(); byte OC_checkFunctionKeyPressed(); byte OC_checkCodeEntered(); -- cgit v1.2.3