aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorStrangerke2013-01-27 23:49:20 +0100
committerStrangerke2013-01-27 23:49:20 +0100
commita896975962078be403cee562598656caae50bb03 (patch)
treef4fc49a942bab465eed3e1ebe760f841d5975ca6 /engines
parent0b78d86335a3c5d657b756729760816ed1369c61 (diff)
downloadscummvm-rg350-a896975962078be403cee562598656caae50bb03.tar.gz
scummvm-rg350-a896975962078be403cee562598656caae50bb03.tar.bz2
scummvm-rg350-a896975962078be403cee562598656caae50bb03.zip
HOPKINS: Renaming of another variable in LinesManager
Diffstat (limited to 'engines')
-rw-r--r--engines/hopkins/lines.cpp10
-rw-r--r--engines/hopkins/lines.h2
2 files changed, 6 insertions, 6 deletions
diff --git a/engines/hopkins/lines.cpp b/engines/hopkins/lines.cpp
index 2b6a650615..4ee656848c 100644
--- a/engines/hopkins/lines.cpp
+++ b/engines/hopkins/lines.cpp
@@ -200,7 +200,7 @@ void LinesManager::addZoneLine(int idx, int a2, int a3, int a4, int a5, int bobZ
*dataP++ = -1;
_zoneLine[idx]._count = v20;
- _zoneLine[idx].field2 = bobZoneIdx;
+ _zoneLine[idx]._bobZoneIdx = bobZoneIdx;
}
}
@@ -3005,7 +3005,7 @@ int LinesManager::MZONE() {
&& _squareZone[squareZoneId]._left <= xp && _squareZone[squareZoneId]._right >= xp
&& _squareZone[squareZoneId]._top <= yp && _squareZone[squareZoneId]._bottom >= yp) {
if (_squareZone[squareZoneId]._squareZoneFl) {
- _vm->_globals.oldzone_46 = _zoneLine[_squareZone[squareZoneId]._minZoneLineIdx].field2;
+ _vm->_globals.oldzone_46 = _zoneLine[_squareZone[squareZoneId]._minZoneLineIdx]._bobZoneIdx;
return _vm->_globals.oldzone_46;
}
_segment[_currentSegmentId]._minZoneLineIdx = _squareZone[squareZoneId]._minZoneLineIdx;
@@ -3112,7 +3112,7 @@ int LinesManager::colision(int xp, int yp) {
int yCheck = *dataP++;
if ((xp == xCheck || (xp + 1) == xCheck) && (yp == yCheck))
- return _vm->_linesManager._zoneLine[curZoneLineIdx].field2;
+ return _vm->_linesManager._zoneLine[curZoneLineIdx]._bobZoneIdx;
}
}
}
@@ -3140,7 +3140,7 @@ void LinesManager::CARRE_ZONE() {
if (dataP == (int16 *)g_PTRNUL)
continue;
- int carreZoneId = _vm->_linesManager._zoneLine[idx].field2;
+ int carreZoneId = _vm->_linesManager._zoneLine[idx]._bobZoneIdx;
_squareZone[carreZoneId]._enabledFl = 1;
if (_squareZone[carreZoneId]._maxZoneLineIdx < idx)
_squareZone[carreZoneId]._maxZoneLineIdx = idx;
@@ -3186,7 +3186,7 @@ void LinesManager::clearAll() {
_vm->_linesManager.Ligne[idx]._lineData = (int16 *)g_PTRNUL;
_vm->_linesManager._zoneLine[idx]._count = 0;
- _vm->_linesManager._zoneLine[idx].field2 = 0;
+ _vm->_linesManager._zoneLine[idx]._bobZoneIdx = 0;
_vm->_linesManager._zoneLine[idx]._zoneData = (int16 *)g_PTRNUL;
}
diff --git a/engines/hopkins/lines.h b/engines/hopkins/lines.h
index 69d59f530f..69efd922d1 100644
--- a/engines/hopkins/lines.h
+++ b/engines/hopkins/lines.h
@@ -32,7 +32,7 @@ class HopkinsEngine;
struct LigneZoneItem {
int _count;
- int field2;
+ int _bobZoneIdx;
int16 *_zoneData;
};