aboutsummaryrefslogtreecommitdiff
path: root/engines/hopkins/script.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'engines/hopkins/script.cpp')
-rw-r--r--engines/hopkins/script.cpp36
1 files changed, 18 insertions, 18 deletions
diff --git a/engines/hopkins/script.cpp b/engines/hopkins/script.cpp
index d100403490..c6046c6a2b 100644
--- a/engines/hopkins/script.cpp
+++ b/engines/hopkins/script.cpp
@@ -759,7 +759,7 @@ int ScriptManager::handleOpcode(byte *dataP) {
case 46: {
_vm->_globals->_checkDistanceFl = true;
- _vm->_linesManager->_route = (RouteItem *)g_PTRNUL;
+ _vm->_linesManager->_route = (RouteItem *)NULL;
_vm->_linesManager->_route = _vm->_linesManager->findRoute(_vm->_objectsManager->getSpriteX(0), _vm->_objectsManager->getSpriteY(0), 564, 420);
_vm->_objectsManager->_zoneNum = -1;
do {
@@ -768,7 +768,7 @@ int ScriptManager::handleOpcode(byte *dataP) {
_vm->_objectsManager->GOHOME();
_vm->_eventsManager->refreshScreenAndEvents();
- } while (_vm->_linesManager->_route != (RouteItem *)g_PTRNUL);
+ } while (_vm->_linesManager->_route != (RouteItem *)NULL);
_vm->_objectsManager->removeSprite(0);
_vm->_globals->_checkDistanceFl = true;
_vm->_soundManager->loadSample(1, "SOUND44.WAV");
@@ -984,7 +984,7 @@ int ScriptManager::handleOpcode(byte *dataP) {
_vm->_objectsManager->_oldCharacterPosX = _vm->_objectsManager->getSpriteX(0);
_vm->_objectsManager->resetOldDirection();
_vm->_objectsManager->resetHomeRateCounter();
- _vm->_linesManager->_route = (RouteItem *)g_PTRNUL;
+ _vm->_linesManager->_route = (RouteItem *)NULL;
_vm->_linesManager->_route = _vm->_linesManager->findRoute(_vm->_objectsManager->getSpriteX(0), _vm->_objectsManager->getSpriteY(0), 445, 332);
_vm->_globals->_checkDistanceFl = true;
do {
@@ -993,7 +993,7 @@ int ScriptManager::handleOpcode(byte *dataP) {
_vm->_objectsManager->GOHOME();
_vm->_eventsManager->refreshScreenAndEvents();
- } while (_vm->_linesManager->_route != (RouteItem *)g_PTRNUL);
+ } while (_vm->_linesManager->_route != (RouteItem *)NULL);
_vm->_objectsManager->removeSprite(0);
_vm->_objectsManager->setBobAnimation(7);
_vm->_objectsManager->setBobAnimDataIdx(7, 0);
@@ -1100,7 +1100,7 @@ int ScriptManager::handleOpcode(byte *dataP) {
_vm->_objectsManager->_oldCharacterPosX = _vm->_objectsManager->getSpriteX(0);
_vm->_objectsManager->resetOldDirection();
_vm->_objectsManager->resetHomeRateCounter();
- _vm->_linesManager->_route = (RouteItem *)g_PTRNUL;
+ _vm->_linesManager->_route = (RouteItem *)NULL;
_vm->_linesManager->_route = _vm->_linesManager->findRoute(_vm->_objectsManager->getSpriteX(0), _vm->_objectsManager->getSpriteY(0), 119, 268);
_vm->_globals->_checkDistanceFl = true;
do {
@@ -1109,7 +1109,7 @@ int ScriptManager::handleOpcode(byte *dataP) {
_vm->_objectsManager->GOHOME();
_vm->_eventsManager->refreshScreenAndEvents();
- } while (_vm->_linesManager->_route != (RouteItem *)g_PTRNUL);
+ } while (_vm->_linesManager->_route != (RouteItem *)NULL);
_vm->_objectsManager->removeSprite(0);
_vm->_objectsManager->setBobAnimation(11);
_vm->_objectsManager->setBobAnimation(8);
@@ -1415,7 +1415,7 @@ int ScriptManager::handleOpcode(byte *dataP) {
_vm->_objectsManager->_oldCharacterPosX = _vm->_objectsManager->getSpriteX(0);
_vm->_objectsManager->resetOldDirection();
_vm->_objectsManager->resetHomeRateCounter();
- _vm->_linesManager->_route = (RouteItem *)g_PTRNUL;
+ _vm->_linesManager->_route = (RouteItem *)NULL;
switch (_vm->_globals->_saveData->_data[svField253]) {
case 1:
_vm->_linesManager->_route = _vm->_linesManager->findRoute(_vm->_objectsManager->getSpriteX(0), _vm->_objectsManager->getSpriteY(0), 201, 294);
@@ -1435,7 +1435,7 @@ int ScriptManager::handleOpcode(byte *dataP) {
_vm->_objectsManager->GOHOME();
_vm->_eventsManager->refreshScreenAndEvents();
- } while (_vm->_linesManager->_route != (RouteItem *)g_PTRNUL);
+ } while (_vm->_linesManager->_route != (RouteItem *)NULL);
_vm->_objectsManager->removeSprite(0);
_vm->_objectsManager->setSpriteIndex(0, 60);
_vm->_soundManager->loadSample(1, "SOUND63.WAV");
@@ -1663,7 +1663,7 @@ int ScriptManager::handleOpcode(byte *dataP) {
_vm->_objectsManager->resetOldDirection();
_vm->_objectsManager->resetHomeRateCounter();
_vm->_globals->_checkDistanceFl = true;
- _vm->_linesManager->_route = (RouteItem *)g_PTRNUL;
+ _vm->_linesManager->_route = (RouteItem *)NULL;
_vm->_linesManager->_route = _vm->_linesManager->findRoute(_vm->_objectsManager->getSpriteX(0), _vm->_objectsManager->getSpriteY(0), 361, 325);
_vm->_globals->_checkDistanceFl = true;
_vm->_objectsManager->_zoneNum = -1;
@@ -1673,7 +1673,7 @@ int ScriptManager::handleOpcode(byte *dataP) {
_vm->_objectsManager->GOHOME();
_vm->_eventsManager->refreshScreenAndEvents();
- } while (_vm->_linesManager->_route != (RouteItem *)g_PTRNUL);
+ } while (_vm->_linesManager->_route != (RouteItem *)NULL);
_vm->_globals->_exitId = 59;
break;
}
@@ -1691,7 +1691,7 @@ int ScriptManager::handleOpcode(byte *dataP) {
_vm->_objectsManager->resetOldDirection();
_vm->_objectsManager->resetHomeRateCounter();
_vm->_globals->_checkDistanceFl = true;
- _vm->_linesManager->_route = (RouteItem *)g_PTRNUL;
+ _vm->_linesManager->_route = (RouteItem *)NULL;
_vm->_linesManager->_route = _vm->_linesManager->findRoute(_vm->_objectsManager->getSpriteX(0), _vm->_objectsManager->getSpriteY(0), 361, 325);
_vm->_globals->_checkDistanceFl = true;
_vm->_objectsManager->_zoneNum = -1;
@@ -1701,7 +1701,7 @@ int ScriptManager::handleOpcode(byte *dataP) {
_vm->_objectsManager->GOHOME();
_vm->_eventsManager->refreshScreenAndEvents();
- } while (_vm->_linesManager->_route != (RouteItem *)g_PTRNUL);
+ } while (_vm->_linesManager->_route != (RouteItem *)NULL);
_vm->_globals->_exitId = 59;
break;
}
@@ -1878,7 +1878,7 @@ int ScriptManager::handleOpcode(byte *dataP) {
_vm->_soundManager->_specialSoundNum = 0;
}
_vm->_globals->_checkDistanceFl = true;
- _vm->_linesManager->_route = (RouteItem *)g_PTRNUL;
+ _vm->_linesManager->_route = (RouteItem *)NULL;
_vm->_linesManager->_route = _vm->_linesManager->findRoute(_vm->_objectsManager->getSpriteX(0), _vm->_objectsManager->getSpriteY(0), 330, 418);
_vm->_globals->_checkDistanceFl = true;
_vm->_objectsManager->_zoneNum = 0;
@@ -1888,7 +1888,7 @@ int ScriptManager::handleOpcode(byte *dataP) {
_vm->_objectsManager->GOHOME();
_vm->_eventsManager->refreshScreenAndEvents();
- } while (_vm->_linesManager->_route != (RouteItem *)g_PTRNUL);
+ } while (_vm->_linesManager->_route != (RouteItem *)NULL);
_vm->_objectsManager->setSpriteIndex(0, 64);
_vm->_globals->_exitId = _vm->_globals->_saveData->_data[svField401];
_vm->_globals->_disableInventFl = false;
@@ -1908,7 +1908,7 @@ int ScriptManager::handleOpcode(byte *dataP) {
_vm->_eventsManager->refreshScreenAndEvents();
} while (_vm->_objectsManager->getBobAnimDataIdx(1) != 9);
_vm->_objectsManager->stopBobAnimation(1);
- _vm->_linesManager->_route = (RouteItem *)g_PTRNUL;
+ _vm->_linesManager->_route = (RouteItem *)NULL;
_vm->_globals->_checkDistanceFl = true;
_vm->_linesManager->_route = _vm->_linesManager->findRoute(_vm->_objectsManager->getSpriteX(0), _vm->_objectsManager->getSpriteY(0), 330, 314);
_vm->_objectsManager->_zoneNum = 0;
@@ -1919,7 +1919,7 @@ int ScriptManager::handleOpcode(byte *dataP) {
_vm->_objectsManager->GOHOME();
_vm->_eventsManager->refreshScreenAndEvents();
- } while (_vm->_linesManager->_route != (RouteItem *)g_PTRNUL);
+ } while (_vm->_linesManager->_route != (RouteItem *)NULL);
_vm->_objectsManager->setSpriteIndex(0, 64);
_vm->_objectsManager->setBobAnimation(2);
_vm->_soundManager->playSoundFile("SOUND66.WAV");
@@ -1999,7 +1999,7 @@ int ScriptManager::handleOpcode(byte *dataP) {
_vm->_objectsManager->resetOldDirection();
_vm->_objectsManager->resetHomeRateCounter();
_vm->_globals->_checkDistanceFl = true;
- _vm->_linesManager->_route = (RouteItem *)g_PTRNUL;
+ _vm->_linesManager->_route = (RouteItem *)NULL;
_vm->_linesManager->_route = _vm->_linesManager->findRoute(_vm->_objectsManager->getSpriteX(0), _vm->_objectsManager->getSpriteY(0), 488, 280);
_vm->_globals->_checkDistanceFl = true;
do {
@@ -2008,7 +2008,7 @@ int ScriptManager::handleOpcode(byte *dataP) {
_vm->_objectsManager->GOHOME();
_vm->_eventsManager->refreshScreenAndEvents();
- } while (_vm->_linesManager->_route != (RouteItem *)g_PTRNUL);
+ } while (_vm->_linesManager->_route != (RouteItem *)NULL);
_vm->_objectsManager->removeSprite(0);
bool playFl = false;
_vm->_objectsManager->setBobAnimation(7);
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-15 22:12:12 +0000