aboutsummaryrefslogtreecommitdiff
path: root/engines/lilliput/lilliput.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'engines/lilliput/lilliput.cpp')
-rw-r--r--engines/lilliput/lilliput.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/engines/lilliput/lilliput.cpp b/engines/lilliput/lilliput.cpp
index 7bec9ba24f..9b1b2fd679 100644
--- a/engines/lilliput/lilliput.cpp
+++ b/engines/lilliput/lilliput.cpp
@@ -135,7 +135,7 @@ LilliputEngine::LilliputEngine(OSystem *syst, const LilliputGameDescription *gd)
_byte1714E = 0;
_byte12FCE = false;
- _byte129A0 = -1;
+ _selectedCharacterId = -1;
_numCharactersToDisplay = 0;
_nextDisplayCharacterPos = Common::Point(0, 0);
_animationTick = 0;
@@ -975,9 +975,9 @@ int16 LilliputEngine::sub16DD5(int x1, int y1, int x2, int y2) {
void LilliputEngine::sub15F75() {
debugC(2, kDebugEngineTBC, "sub15F75()");
- _byte129A0 = -1;
+ _selectedCharacterId = -1;
_savedMousePosDivided = Common::Point(-1, -1);
- byte newX = _mousePos.x >> 2;
+ byte newX = _mousePos.x / 4;
byte newY = _mousePos.y / 3;
if ((newX >= 64) || (newY >= 64))
@@ -2011,7 +2011,7 @@ void LilliputEngine::sub130EE() {
return;
forceReturnFl = false;
- sub131B2(pos, forceReturnFl);
+ checkClickOnCharacter(pos, forceReturnFl);
if (forceReturnFl)
return;
@@ -2038,14 +2038,14 @@ void LilliputEngine::sub131FC(Common::Point pos) {
}
}
-void LilliputEngine::sub131B2(Common::Point pos, bool &forceReturnFl) {
- debugC(2, kDebugEngine, "sub131B2(%d, %d)", pos.x, pos.y);
+void LilliputEngine::checkClickOnCharacter(Common::Point pos, bool &forceReturnFl) {
+ debugC(2, kDebugEngine, "checkClickOnCharacter(%d, %d)", pos.x, pos.y);
forceReturnFl = false;
for (int8 i = 0; i < _numCharacters; i++) {
if ((pos.x >= _characterDisplayX[i]) && (pos.x <= _characterDisplayX[i] + 17) && (pos.y >= _characterDisplayY[i]) && (pos.y <= _characterDisplayY[i] + 17) && (i != _word10804)) {
- _byte129A0 = i;
+ _selectedCharacterId = i;
_byte16F07_menuId = 4;
if (_byte12FCE)
_byte16F07_menuId = 3;
@@ -2817,7 +2817,7 @@ void LilliputEngine::handleMenu() {
_scriptHandler->runMenuScript(ScriptStream(_menuScript, _menuScriptSize));
debugC(1, kDebugScriptTBC, "========================== End of Menu Script==============================");
_savedMousePosDivided = Common::Point(-1, -1);
- _byte129A0 = -1;
+ _selectedCharacterId = -1;
if (_byte16F07_menuId == 3)
unselectInterfaceButton();