aboutsummaryrefslogtreecommitdiff
path: root/engines/hopkins/script.cpp
diff options
context:
space:
mode:
authorWillem Jan Palenstijn2013-02-16 10:55:07 +0100
committerWillem Jan Palenstijn2013-02-16 15:59:02 +0100
commitcccbd842041c3e6099dce790911d4c02da62874e (patch)
tree2bcd8e6f56e474a404576267ddead7f17c78edae /engines/hopkins/script.cpp
parent84e290eade13bfdff1e866d058af447893bee321 (diff)
downloadscummvm-rg350-cccbd842041c3e6099dce790911d4c02da62874e.tar.gz
scummvm-rg350-cccbd842041c3e6099dce790911d4c02da62874e.tar.bz2
scummvm-rg350-cccbd842041c3e6099dce790911d4c02da62874e.zip
HOPKINS: Convert route lists into structs
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 aed99045c4..33876f8293 100644
--- a/engines/hopkins/script.cpp
+++ b/engines/hopkins/script.cpp
@@ -745,7 +745,7 @@ int ScriptManager::handleOpcode(byte *dataP) {
case 46: {
_vm->_globals.NOT_VERIF = true;
- _vm->_linesManager._route = (int16 *)g_PTRNUL;
+ _vm->_linesManager._route = (RouteItem *)g_PTRNUL;
_vm->_linesManager._route = _vm->_linesManager.PARCOURS2(_vm->_objectsManager.getSpriteX(0), _vm->_objectsManager.getSpriteY(0), 564, 420);
_vm->_objectsManager._zoneNum = -1;
do {
@@ -754,7 +754,7 @@ int ScriptManager::handleOpcode(byte *dataP) {
_vm->_objectsManager.GOHOME();
_vm->_eventsManager.VBL();
- } while (_vm->_linesManager._route != (int16 *)g_PTRNUL);
+ } while (_vm->_linesManager._route != (RouteItem *)g_PTRNUL);
_vm->_objectsManager.removeSprite(0);
_vm->_globals.NOT_VERIF = true;
_vm->_soundManager.loadSample(1, "SOUND44.WAV");
@@ -957,7 +957,7 @@ int ScriptManager::handleOpcode(byte *dataP) {
_vm->_objectsManager._oldCharacterPosX = _vm->_objectsManager.getSpriteX(0);
_vm->_globals._oldDirection = -1;
_vm->_globals.Compteur = 0;
- _vm->_linesManager._route = (int16 *)g_PTRNUL;
+ _vm->_linesManager._route = (RouteItem *)g_PTRNUL;
_vm->_linesManager._route = _vm->_linesManager.PARCOURS2(_vm->_objectsManager.getSpriteX(0), _vm->_objectsManager.getSpriteY(0), 445, 332);
_vm->_globals.NOT_VERIF = true;
do {
@@ -966,7 +966,7 @@ int ScriptManager::handleOpcode(byte *dataP) {
_vm->_objectsManager.GOHOME();
_vm->_eventsManager.VBL();
- } while (_vm->_linesManager._route != (int16 *)g_PTRNUL);
+ } while (_vm->_linesManager._route != (RouteItem *)g_PTRNUL);
_vm->_objectsManager.removeSprite(0);
_vm->_objectsManager.setBobAnimation(7);
_vm->_objectsManager.setBobAnimDataIdx(7, 0);
@@ -1057,7 +1057,7 @@ int ScriptManager::handleOpcode(byte *dataP) {
_vm->_objectsManager._oldCharacterPosX = _vm->_objectsManager.getSpriteX(0);
_vm->_globals._oldDirection = -1;
_vm->_globals.Compteur = 0;
- _vm->_linesManager._route = (int16 *)g_PTRNUL;
+ _vm->_linesManager._route = (RouteItem *)g_PTRNUL;
_vm->_linesManager._route = _vm->_linesManager.PARCOURS2(_vm->_objectsManager.getSpriteX(0), _vm->_objectsManager.getSpriteY(0), 119, 268);
_vm->_globals.NOT_VERIF = true;
do {
@@ -1066,7 +1066,7 @@ int ScriptManager::handleOpcode(byte *dataP) {
_vm->_objectsManager.GOHOME();
_vm->_eventsManager.VBL();
- } while (_vm->_linesManager._route != (int16 *)g_PTRNUL);
+ } while (_vm->_linesManager._route != (RouteItem *)g_PTRNUL);
_vm->_objectsManager.removeSprite(0);
_vm->_objectsManager.setBobAnimation(11);
_vm->_objectsManager.setBobAnimation(8);
@@ -1374,7 +1374,7 @@ int ScriptManager::handleOpcode(byte *dataP) {
_vm->_objectsManager._oldCharacterPosX = _vm->_objectsManager.getSpriteX(0);
_vm->_globals._oldDirection = -1;
_vm->_globals.Compteur = 0;
- _vm->_linesManager._route = (int16 *)g_PTRNUL;
+ _vm->_linesManager._route = (RouteItem *)g_PTRNUL;
if (_vm->_globals._saveData->_data[svField253] == 1) {
_vm->_linesManager._route = _vm->_linesManager.PARCOURS2(_vm->_objectsManager.getSpriteX(0), _vm->_objectsManager.getSpriteY(0), 201, 294);
}
@@ -1391,7 +1391,7 @@ int ScriptManager::handleOpcode(byte *dataP) {
_vm->_objectsManager.GOHOME();
_vm->_eventsManager.VBL();
- } while (_vm->_linesManager._route != (int16 *)g_PTRNUL);
+ } while (_vm->_linesManager._route != (RouteItem *)g_PTRNUL);
_vm->_objectsManager.removeSprite(0);
_vm->_objectsManager.setSpriteIndex(0, 60);
_vm->_soundManager.loadSample(1, "SOUND63.WAV");
@@ -1622,7 +1622,7 @@ int ScriptManager::handleOpcode(byte *dataP) {
_vm->_globals._oldDirection = -1;
_vm->_globals.Compteur = 0;
_vm->_globals.NOT_VERIF = true;
- _vm->_linesManager._route = (int16 *)g_PTRNUL;
+ _vm->_linesManager._route = (RouteItem *)g_PTRNUL;
_vm->_linesManager._route = _vm->_linesManager.PARCOURS2(_vm->_objectsManager.getSpriteX(0), _vm->_objectsManager.getSpriteY(0), 361, 325);
_vm->_globals.NOT_VERIF = true;
_vm->_objectsManager._zoneNum = -1;
@@ -1632,7 +1632,7 @@ int ScriptManager::handleOpcode(byte *dataP) {
_vm->_objectsManager.GOHOME();
_vm->_eventsManager.VBL();
- } while (_vm->_linesManager._route != (int16 *)g_PTRNUL);
+ } while (_vm->_linesManager._route != (RouteItem *)g_PTRNUL);
_vm->_globals._exitId = 59;
break;
}
@@ -1650,7 +1650,7 @@ int ScriptManager::handleOpcode(byte *dataP) {
_vm->_globals._oldDirection = -1;
_vm->_globals.Compteur = 0;
_vm->_globals.NOT_VERIF = true;
- _vm->_linesManager._route = (int16 *)g_PTRNUL;
+ _vm->_linesManager._route = (RouteItem *)g_PTRNUL;
_vm->_linesManager._route = _vm->_linesManager.PARCOURS2(_vm->_objectsManager.getSpriteX(0), _vm->_objectsManager.getSpriteY(0), 361, 325);
_vm->_globals.NOT_VERIF = true;
_vm->_objectsManager._zoneNum = -1;
@@ -1660,7 +1660,7 @@ int ScriptManager::handleOpcode(byte *dataP) {
_vm->_objectsManager.GOHOME();
_vm->_eventsManager.VBL();
- } while (_vm->_linesManager._route != (int16 *)g_PTRNUL);
+ } while (_vm->_linesManager._route != (RouteItem *)g_PTRNUL);
_vm->_globals._exitId = 59;
break;
}
@@ -1823,7 +1823,7 @@ int ScriptManager::handleOpcode(byte *dataP) {
_vm->_soundManager._specialSoundNum = 0;
}
_vm->_globals.NOT_VERIF = true;
- _vm->_linesManager._route = (int16 *)g_PTRNUL;
+ _vm->_linesManager._route = (RouteItem *)g_PTRNUL;
_vm->_linesManager._route = _vm->_linesManager.PARCOURS2(_vm->_objectsManager.getSpriteX(0), _vm->_objectsManager.getSpriteY(0), 330, 418);
_vm->_globals.NOT_VERIF = true;
_vm->_objectsManager._zoneNum = 0;
@@ -1833,7 +1833,7 @@ int ScriptManager::handleOpcode(byte *dataP) {
_vm->_objectsManager.GOHOME();
_vm->_eventsManager.VBL();
- } while (_vm->_linesManager._route != (int16 *)g_PTRNUL);
+ } while (_vm->_linesManager._route != (RouteItem *)g_PTRNUL);
_vm->_objectsManager.setSpriteIndex(0, 64);
_vm->_globals._exitId = _vm->_globals._saveData->_data[svField401];
_vm->_globals._disableInventFl = false;
@@ -1853,7 +1853,7 @@ int ScriptManager::handleOpcode(byte *dataP) {
_vm->_eventsManager.VBL();
} while (_vm->_objectsManager.getBobAnimDataIdx(1) != 9);
_vm->_objectsManager.stopBobAnimation(1);
- _vm->_linesManager._route = (int16 *)g_PTRNUL;
+ _vm->_linesManager._route = (RouteItem *)g_PTRNUL;
_vm->_globals.NOT_VERIF = true;
_vm->_linesManager._route = _vm->_linesManager.PARCOURS2(_vm->_objectsManager.getSpriteX(0), _vm->_objectsManager.getSpriteY(0), 330, 314);
_vm->_objectsManager._zoneNum = 0;
@@ -1864,7 +1864,7 @@ int ScriptManager::handleOpcode(byte *dataP) {
_vm->_objectsManager.GOHOME();
_vm->_eventsManager.VBL();
- } while (_vm->_linesManager._route != (int16 *)g_PTRNUL);
+ } while (_vm->_linesManager._route != (RouteItem *)g_PTRNUL);
_vm->_objectsManager.setSpriteIndex(0, 64);
_vm->_objectsManager.setBobAnimation(2);
_vm->_soundManager.playSound("SOUND66.WAV");
@@ -1952,7 +1952,7 @@ int ScriptManager::handleOpcode(byte *dataP) {
_vm->_globals._oldDirection = -1;
_vm->_globals.Compteur = 0;
_vm->_globals.NOT_VERIF = true;
- _vm->_linesManager._route = (int16 *)g_PTRNUL;
+ _vm->_linesManager._route = (RouteItem *)g_PTRNUL;
_vm->_linesManager._route = _vm->_linesManager.PARCOURS2(_vm->_objectsManager.getSpriteX(0), _vm->_objectsManager.getSpriteY(0), 488, 280);
_vm->_globals.NOT_VERIF = true;
do {
@@ -1961,7 +1961,7 @@ int ScriptManager::handleOpcode(byte *dataP) {
_vm->_objectsManager.GOHOME();
_vm->_eventsManager.VBL();
- } while (_vm->_linesManager._route != (int16 *)g_PTRNUL);
+ } while (_vm->_linesManager._route != (RouteItem *)g_PTRNUL);
_vm->_objectsManager.removeSprite(0);
int v45 = 0;
_vm->_objectsManager.setBobAnimation(7);
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-25 00:44:10 +0000