diff options
-rw-r--r-- | engines/hopkins/lines.cpp | 6 | ||||
-rw-r--r-- | engines/hopkins/objects.cpp | 20 |
2 files changed, 13 insertions, 13 deletions
diff --git a/engines/hopkins/lines.cpp b/engines/hopkins/lines.cpp index 2a2d6405a2..4e57f65adf 100644 --- a/engines/hopkins/lines.cpp +++ b/engines/hopkins/lines.cpp @@ -2067,15 +2067,15 @@ RouteItem *LinesManager::cityMapCarRoute(int x1, int y1, int x2, int y2) { for (;;) { curRouteX = _testRoute2[curRouteIdx]._x; int curRouteY = _testRoute2[curRouteIdx]._y; - Directions v66 = _testRoute2[curRouteIdx]._dir; + Directions curRouteDir = _testRoute2[curRouteIdx]._dir; curRouteIdx++; if (checkCollisionLine(curRouteX, curRouteY, &arrDataIdx[DIR_UP], &arrLineIdx[DIR_UP], 0, _lastLine)) break; - _bestRoute[superRouteIdx].set(curRouteX, curRouteY, v66); + _bestRoute[superRouteIdx].set(curRouteX, curRouteY, curRouteDir); - _testRoute0[superRouteIdx].set(curRouteX, curRouteY, v66); + _testRoute0[superRouteIdx].set(curRouteX, curRouteY, curRouteDir); superRouteIdx++; if (curRouteX == -1) break;; diff --git a/engines/hopkins/objects.cpp b/engines/hopkins/objects.cpp index e158e5e997..0ceacdd77a 100644 --- a/engines/hopkins/objects.cpp +++ b/engines/hopkins/objects.cpp @@ -588,15 +588,15 @@ void ObjectsManager::displayBob(int idx) { return; - int16 v9 = READ_LE_INT16(data + 2); - int16 v8 = READ_LE_INT16(data + 4); + int16 bobModeChange = READ_LE_INT16(data + 2); + int16 newField22 = READ_LE_INT16(data + 4); // data[6] isn't used, read skipped - int16 v6 = READ_LE_INT16(data + 8); + int16 newField20 = READ_LE_INT16(data + 8); - if (!v9) - v9 = 1; - if (!v6) - v6 = -1; + if (!bobModeChange) + bobModeChange = 1; + if (!newField20) + newField20 = -1; _bob[idx]._isSpriteFl = false; @@ -610,9 +610,9 @@ void ObjectsManager::displayBob(int idx) { _bob[idx]._bobMode = 10; _bob[idx]._spriteData = _vm->_globals->Bank[bankIdx]._data; - _bob[idx]._bobModeChange = v9; - _bob[idx].field20 = v6; - _bob[idx].field22 = v8; + _bob[idx]._bobModeChange = bobModeChange; + _bob[idx].field20 = newField20; + _bob[idx].field22 = newField22; } void ObjectsManager::hideBob(int idx) { |