From 920a5ac5f43dfe76283d55e3eb285a87c2c44b2a Mon Sep 17 00:00:00 2001 From: Travis Howell Date: Tue, 24 Oct 2006 08:11:43 +0000 Subject: Rename variable svn-id: r24487 --- engines/agos/agos.cpp | 2 +- engines/agos/agos.h | 2 +- engines/agos/cursor.cpp | 3 ++- engines/agos/menus.cpp | 3 --- engines/agos/verb.cpp | 2 +- 5 files changed, 5 insertions(+), 7 deletions(-) (limited to 'engines') diff --git a/engines/agos/agos.cpp b/engines/agos/agos.cpp index 6d840713a4..8ce3b87bee 100644 --- a/engines/agos/agos.cpp +++ b/engines/agos/agos.cpp @@ -142,7 +142,7 @@ AGOSEngine::AGOSEngine(OSystem *syst) _skipVgaWait = 0; _noParentNotify = 0; _beardLoaded = 0; - _hitarea_unk_3 = 0; + _litBoxFlag = 0; _mortalFlag = 0; _updateScreen = false; _syncFlag2 = 0; diff --git a/engines/agos/agos.h b/engines/agos/agos.h index 4e07716932..427b60072c 100644 --- a/engines/agos/agos.h +++ b/engines/agos/agos.h @@ -278,7 +278,7 @@ protected: bool _skipVgaWait; bool _noParentNotify; bool _beardLoaded; - bool _hitarea_unk_3; + bool _litBoxFlag; bool _mortalFlag; bool _updateScreen; bool _syncFlag2; diff --git a/engines/agos/cursor.cpp b/engines/agos/cursor.cpp index 5c97d008b9..4edfd6d487 100644 --- a/engines/agos/cursor.cpp +++ b/engines/agos/cursor.cpp @@ -439,7 +439,7 @@ void AGOSEngine::handleMouseMoved() { _rightButtonDown = 0; x = 1; } else { - if (_hitarea_unk_3 == 0 && _needHitAreaRecalc == 0) + if (_litBoxFlag == 0 && _needHitAreaRecalc == 0) goto get_out; } @@ -456,6 +456,7 @@ get_out: drawMousePointer(); _needHitAreaRecalc = 0; + _litBoxFlag = 0; } void AGOSEngine::mouseOff() { diff --git a/engines/agos/menus.cpp b/engines/agos/menus.cpp index 5383306fe9..ff86a05724 100644 --- a/engines/agos/menus.cpp +++ b/engines/agos/menus.cpp @@ -128,9 +128,6 @@ void AGOSEngine::lightMenuStrip(int a) { unlightMenuStrip(); for (int i = 120; i != 130; i++) { - if (a == 0) - break; - if (a & (1 << i - 120)) { enableBox(i); lightMenuBox(i); diff --git a/engines/agos/verb.cpp b/engines/agos/verb.cpp index 337a9accc7..05167d5cc1 100644 --- a/engines/agos/verb.cpp +++ b/engines/agos/verb.cpp @@ -910,7 +910,7 @@ void AGOSEngine::invertBox(HitArea * ha, byte a, byte b, byte c, byte d) { _lockWord |= 0x8000; src = getFrontBuf() + ha->y * _dxSurfacePitch + ha->x; - _hitarea_unk_3 = true; + _litBoxFlag = true; w = ha->width; h = ha->height; -- cgit v1.2.3