diff options
author | Strangerke | 2012-07-01 01:58:15 +0200 |
---|---|---|
committer | Eugene Sandulenko | 2018-03-28 17:36:57 +0200 |
commit | 4efebbbeee94e24ecc9a95588a3c21b15d9b14d6 (patch) | |
tree | e9faa6ac0aea04f0aca8f7b91f486c6f015692e9 | |
parent | 9f93ceb8aa9e05f85b547326601d619aa572ce44 (diff) | |
download | scummvm-rg350-4efebbbeee94e24ecc9a95588a3c21b15d9b14d6.tar.gz scummvm-rg350-4efebbbeee94e24ecc9a95588a3c21b15d9b14d6.tar.bz2 scummvm-rg350-4efebbbeee94e24ecc9a95588a3c21b15d9b14d6.zip |
LILLIPUT: Some more renaming
-rw-r--r-- | engines/lilliput/lilliput.cpp | 18 | ||||
-rw-r--r-- | engines/lilliput/lilliput.h | 2 | ||||
-rw-r--r-- | engines/lilliput/script.cpp | 8 | ||||
-rw-r--r-- | engines/lilliput/script.h | 2 |
4 files changed, 14 insertions, 16 deletions
diff --git a/engines/lilliput/lilliput.cpp b/engines/lilliput/lilliput.cpp index 21790c52ea..773f09bfa8 100644 --- a/engines/lilliput/lilliput.cpp +++ b/engines/lilliput/lilliput.cpp @@ -821,7 +821,7 @@ void LilliputEngine::displayRefreshScreen() { sub16EBC(); sub171CF(); handleGameMouseClick(); - sub12FE5(); + checkInterfaceActivationDelay(); displayHeroismIndicator(); } } @@ -2344,24 +2344,24 @@ void LilliputEngine::sub171CF() { } } -void LilliputEngine::sub12FE5() { - debugC(2, kDebugEngine, "sub12FE5()"); +void LilliputEngine::checkInterfaceActivationDelay() { + debugC(2, kDebugEngine, "checkInterfaceActivationDelay()"); if (_animationTick != 1) return; - int count = 0; + bool needRedraw = false; for (int i = 0; i < _interfaceHotspotNumb; i++) { - if (_scriptHandler->_array122FD[i] != 0) { - --_scriptHandler->_array122FD[i]; - if (_scriptHandler->_array122FD[i] == 0) { + if (_scriptHandler->_interfaceButtonActivationDelay[i] != 0) { + --_scriptHandler->_interfaceButtonActivationDelay[i]; + if (_scriptHandler->_interfaceButtonActivationDelay[i] == 0) { _scriptHandler->_interfaceHotspotStatus[i] = kHotspotEnabled; - ++count; + needRedraw = true; } } } - if (count != 0) + if (needRedraw) displayInterfaceHotspots(); } diff --git a/engines/lilliput/lilliput.h b/engines/lilliput/lilliput.h index 2ea4a5705d..8d15400b06 100644 --- a/engines/lilliput/lilliput.h +++ b/engines/lilliput/lilliput.h @@ -286,7 +286,7 @@ public: void sub16CA0(); byte sub166DD(int index, Common::Point var1); void sub171CF(); - void sub12FE5(); + void checkInterfaceActivationDelay(); int16 sub16DD5(int x1, int y1, int x2, int y2); void displayCharactersOnMap(); void restoreMapPoints(); diff --git a/engines/lilliput/script.cpp b/engines/lilliput/script.cpp index e6e4df22b9..af0879fc3d 100644 --- a/engines/lilliput/script.cpp +++ b/engines/lilliput/script.cpp @@ -53,7 +53,7 @@ LilliputScript::LilliputScript(LilliputEngine *vm) : _vm(vm), _currScript(NULL) for (int i = 0; i < 20; i++) { _interfaceHotspotStatus[i] = kHotspotOff; - _array122FD[i] = 0; + _interfaceButtonActivationDelay[i] = 0; } for (int i = 0; i < 32; i++) @@ -2803,9 +2803,7 @@ void LilliputScript::OC_setInterfaceHotspot() { uint16 curWord = _currScript->readUint16LE(); _interfaceHotspotStatus[index] = (curWord & 0xFF); - _array122FD[index] = (curWord >> 8); - if (_array122FD[index] != 0) - warning("debug - OC_setInterfaceHotspot - _array122FD[index] = %d", _array122FD[index]); + _interfaceButtonActivationDelay[index] = (curWord >> 8); _vm->displayInterfaceHotspots(); } @@ -3095,7 +3093,7 @@ void LilliputScript::OC_disableInterfaceHotspot() { debugC(1, kDebugScript, "OC_disableInterfaceHotspot()"); int index = _currScript->readUint16LE(); - _array122FD[index] = (_currScript->readUint16LE() & 0xFF); + _interfaceButtonActivationDelay[index] = (_currScript->readUint16LE() & 0xFF); _interfaceHotspotStatus[index] = kHotspotDisabled; _vm->displayInterfaceHotspots(); diff --git a/engines/lilliput/script.h b/engines/lilliput/script.h index 240da58608..51b06ec7ef 100644 --- a/engines/lilliput/script.h +++ b/engines/lilliput/script.h @@ -72,7 +72,7 @@ public: int8 _characterTilePosY[40]; int8 _array12811[40]; int8 _array10AB1[40]; - byte _array122FD[20]; + byte _interfaceButtonActivationDelay[20]; byte _array122C1[40]; byte _array10A39[40]; int16 _array10B51[40 * 40]; |