aboutsummaryrefslogtreecommitdiff
path: root/engines/hopkins/objects.cpp
diff options
context:
space:
mode:
authorStrangerke2013-03-28 10:25:42 +0100
committerStrangerke2013-03-28 10:26:35 +0100
commit6c9458617e1b1dcf81417bcf0015b9abbe223f72 (patch)
treeed5f176f231678827cdbd1de1ec1df631abcb256 /engines/hopkins/objects.cpp
parentb4df7868a1c6c846014159b31fc846c7426f1b9c (diff)
downloadscummvm-rg350-6c9458617e1b1dcf81417bcf0015b9abbe223f72.tar.gz
scummvm-rg350-6c9458617e1b1dcf81417bcf0015b9abbe223f72.tar.bz2
scummvm-rg350-6c9458617e1b1dcf81417bcf0015b9abbe223f72.zip
HOPKINS: Some renaming in LinesManager
Diffstat (limited to 'engines/hopkins/objects.cpp')
-rw-r--r--engines/hopkins/objects.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/engines/hopkins/objects.cpp b/engines/hopkins/objects.cpp
index 6cb2ca17ed..982678ba80 100644
--- a/engines/hopkins/objects.cpp
+++ b/engines/hopkins/objects.cpp
@@ -1796,7 +1796,7 @@ void ObjectsManager::loadZone(const Common::String &file) {
_vm->_linesManager->ZONEP[i + 1]._messageId = READ_LE_UINT16(verbData + 2 * i);
_vm->_globals->freeMemory(ptr);
- _vm->_linesManager->CARRE_ZONE();
+ _vm->_linesManager->initSquareZones();
}
void ObjectsManager::handleCityMap() {
@@ -1984,9 +1984,9 @@ void ObjectsManager::handleLeftButton() {
_homeRateCounter = 0;
_oldDirection = DIR_NONE;
} else {
- _vm->_linesManager->_route = _vm->_linesManager->PARCOURS2(getSpriteX(0), getSpriteY(0), getSpriteX(0), 390);
+ _vm->_linesManager->_route = _vm->_linesManager->findRoute(getSpriteX(0), getSpriteY(0), getSpriteX(0), 390);
if (_vm->_linesManager->_route != (RouteItem *)g_PTRNUL)
- _vm->_linesManager->PACOURS_PROPRE(_vm->_linesManager->_route);
+ _vm->_linesManager->optimizeRoute(_vm->_linesManager->_route);
_oldCharacterPosX = getSpriteX(0);
_oldCharacterPosY = getSpriteY(0);
_homeRateCounter = 0;
@@ -1998,9 +1998,9 @@ void ObjectsManager::handleLeftButton() {
}
} else {
if (!_vm->_globals->_freezeCharacterFl && !_vm->_globals->_cityMapEnabledFl) {
- _vm->_linesManager->_route = _vm->_linesManager->PARCOURS2(getSpriteX(0), getSpriteY(0), destX, destY);
+ _vm->_linesManager->_route = _vm->_linesManager->findRoute(getSpriteX(0), getSpriteY(0), destX, destY);
if (_vm->_linesManager->_route != (RouteItem *)g_PTRNUL)
- _vm->_linesManager->PACOURS_PROPRE(_vm->_linesManager->_route);
+ _vm->_linesManager->optimizeRoute(_vm->_linesManager->_route);
_oldCharacterPosX = getSpriteX(0);
_oldCharacterPosY = getSpriteY(0);
_homeRateCounter = 0;
@@ -3272,7 +3272,7 @@ void ObjectsManager::loadLinkFile(const Common::String &file) {
_vm->_linesManager->ZONEP[i]._messageId = READ_LE_INT16(verbData + dep);
dep += 2;
}
- _vm->_linesManager->CARRE_ZONE();
+ _vm->_linesManager->initSquareZones();
}
}
}
@@ -3788,7 +3788,7 @@ void ObjectsManager::PERSONAGE(const Common::String &backgroundFile, const Commo
_oldDirection = DIR_NONE;
_homeRateCounter = 0;
_vm->_linesManager->_route = (RouteItem *)g_PTRNUL;
- _vm->_linesManager->_route = _vm->_linesManager->PARCOURS2(getSpriteX(0), getSpriteY(0), 330, 345);
+ _vm->_linesManager->_route = _vm->_linesManager->findRoute(getSpriteX(0), getSpriteY(0), 330, 345);
_vm->_globals->_checkDistanceFl = true;
do {
GOHOME();