[Scummvm-cvs-logs] scummvm master -> 149bb0ca008fb0d53546ca254cf2071e59a380ae
Strangerke
Strangerke at scummvm.org
Sun Mar 24 17:44:56 CET 2013
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
149bb0ca00 HOPKINS: Move counter to LinesManager, rename it to follow coding conventions
Commit: 149bb0ca008fb0d53546ca254cf2071e59a380ae
https://github.com/scummvm/scummvm/commit/149bb0ca008fb0d53546ca254cf2071e59a380ae
Author: Strangerke (strangerke at scummvm.org)
Date: 2013-03-24T09:43:16-07:00
Commit Message:
HOPKINS: Move counter to LinesManager, rename it to follow coding conventions
Changed paths:
engines/hopkins/globals.cpp
engines/hopkins/globals.h
engines/hopkins/lines.cpp
engines/hopkins/lines.h
diff --git a/engines/hopkins/globals.cpp b/engines/hopkins/globals.cpp
index db7dca7..79edddc 100644
--- a/engines/hopkins/globals.cpp
+++ b/engines/hopkins/globals.cpp
@@ -170,7 +170,6 @@ Globals::Globals(HopkinsEngine *vm) {
_oldZoneNum = 0;
_oldMouseX = 0;
_oldMouseY = 0;
- compteur_71 = 0;
_forceHideText = false;
}
diff --git a/engines/hopkins/globals.h b/engines/hopkins/globals.h
index e743249..84549fa 100644
--- a/engines/hopkins/globals.h
+++ b/engines/hopkins/globals.h
@@ -311,7 +311,6 @@ public:
ListeItem Liste2[35];
BankItem Bank[8];
VBobItem VBob[30];
- int compteur_71;
Globals(HopkinsEngine *vm);
~Globals();
diff --git a/engines/hopkins/lines.cpp b/engines/hopkins/lines.cpp
index 8763fd1..f47a444 100644
--- a/engines/hopkins/lines.cpp
+++ b/engines/hopkins/lines.cpp
@@ -74,6 +74,7 @@ LinesManager::LinesManager(HopkinsEngine *vm) {
_route = (RouteItem *)g_PTRNUL;
_currentSegmentId = 0;
_largeBuf = g_PTRNUL;
+ _zoneSkipCount = 0;
}
LinesManager::~LinesManager() {
@@ -2822,19 +2823,19 @@ void LinesManager::checkZone() {
_vm->_objectsManager->_visibleFl = true;
}
if (_vm->_objectsManager->_forceZoneFl) {
- _vm->_globals->compteur_71 = 100;
+ _zoneSkipCount = 100;
_vm->_globals->_oldMouseZoneId = -1;
_vm->_globals->_oldMouseX = -200;
_vm->_globals->_oldMouseY = -220;
_vm->_objectsManager->_forceZoneFl = false;
}
- _vm->_globals->compteur_71++;
- if (_vm->_globals->compteur_71 <= 1)
+ _zoneSkipCount++;
+ if (_zoneSkipCount <= 1)
return;
- if (_vm->_globals->_freezeCharacterFl || (_route == (RouteItem *)g_PTRNUL) || _vm->_globals->compteur_71 > 4) {
- _vm->_globals->compteur_71 = 0;
+ if (_vm->_globals->_freezeCharacterFl || (_route == (RouteItem *)g_PTRNUL) || _zoneSkipCount > 4) {
+ _zoneSkipCount = 0;
int zoneId;
if (_vm->_globals->_oldMouseX != mouseX || _vm->_globals->_oldMouseY != oldMouseY) {
zoneId = getMouseZone();
diff --git a/engines/hopkins/lines.h b/engines/hopkins/lines.h
index 79dde89..2d0b3b0 100644
--- a/engines/hopkins/lines.h
+++ b/engines/hopkins/lines.h
@@ -128,6 +128,7 @@ private:
int16 *_lineBuf;
LigneItem _lineItem[400];
RouteItem _bestRoute[8001];
+ int _zoneSkipCount;
int checkInventoryHotspotsRow(int posX, int minZoneNum, bool lastRow);
void removeZoneLine(int idx);
More information about the Scummvm-git-logs
mailing list