diff options
author | Eugene Sandulenko | 2016-12-10 14:39:28 +0100 |
---|---|---|
committer | Eugene Sandulenko | 2016-12-10 14:42:36 +0100 |
commit | 88a3a2bc4daa160ab03c75aa495954e8035acc19 (patch) | |
tree | 5756947ba7e24ed960bda3c92dcf3655c6924de4 | |
parent | 65c83d8511e9340c556be1181e60daced4210185 (diff) | |
download | scummvm-rg350-88a3a2bc4daa160ab03c75aa495954e8035acc19.tar.gz scummvm-rg350-88a3a2bc4daa160ab03c75aa495954e8035acc19.tar.bz2 scummvm-rg350-88a3a2bc4daa160ab03c75aa495954e8035acc19.zip |
FULLPIPE: Clarify null callback usage across the scenes
-rw-r--r-- | engines/fullpipe/messagehandlers.cpp | 2 | ||||
-rw-r--r-- | engines/fullpipe/scenes.cpp | 4 | ||||
-rw-r--r-- | engines/fullpipe/scenes/scene06.cpp | 2 | ||||
-rw-r--r-- | engines/fullpipe/scenes/scene09.cpp | 8 | ||||
-rw-r--r-- | engines/fullpipe/scenes/scene13.cpp | 4 | ||||
-rw-r--r-- | engines/fullpipe/scenes/scene14.cpp | 2 | ||||
-rw-r--r-- | engines/fullpipe/scenes/scene27.cpp | 4 | ||||
-rw-r--r-- | engines/fullpipe/statics.cpp | 4 |
8 files changed, 17 insertions, 13 deletions
diff --git a/engines/fullpipe/messagehandlers.cpp b/engines/fullpipe/messagehandlers.cpp index 947caadbcc..4aefa80644 100644 --- a/engines/fullpipe/messagehandlers.cpp +++ b/engines/fullpipe/messagehandlers.cpp @@ -308,7 +308,7 @@ int global_messageHandler2(ExCommand *cmd) { ani->_callback2 = staticANIObjectCallback; } else { ani->setFlags40(false); - ani->_callback2 = 0; + ani->_callback2 = 0; // Really NULL } } break; diff --git a/engines/fullpipe/scenes.cpp b/engines/fullpipe/scenes.cpp index 15f6b0bdbc..967eb0aa40 100644 --- a/engines/fullpipe/scenes.cpp +++ b/engines/fullpipe/scenes.cpp @@ -553,8 +553,8 @@ bool FullpipeEngine::sceneSwitcher(EntranceInfo *entrance) { _aniMan->setOXY(0, 0); _aniMan->clearFlags(); - _aniMan->_callback1 = 0; - _aniMan->_callback2 = 0; + _aniMan->_callback1 = 0; // Really NULL + _aniMan->_callback2 = 0; // Really NULL _aniMan->_shadowsOn = 1; _scrollSpeed = 8; diff --git a/engines/fullpipe/scenes/scene06.cpp b/engines/fullpipe/scenes/scene06.cpp index 6d8c152052..a6d93b69bd 100644 --- a/engines/fullpipe/scenes/scene06.cpp +++ b/engines/fullpipe/scenes/scene06.cpp @@ -82,7 +82,7 @@ void sceneHandler06_winArcade() { g_fp->setObjectState(sO_ClockAxis, g_fp->getObjectEnumState(sO_ClockAxis, sO_WithoutHandle)); if (g_vars->scene06_arcadeEnabled) { - g_fp->_aniMan->_callback2 = 0; + g_fp->_aniMan->_callback2 = 0; // Really NULL g_fp->_aniMan->changeStatics2(ST_MAN_RIGHT | 0x4000); diff --git a/engines/fullpipe/scenes/scene09.cpp b/engines/fullpipe/scenes/scene09.cpp index 42d02917ef..eb635f16f0 100644 --- a/engines/fullpipe/scenes/scene09.cpp +++ b/engines/fullpipe/scenes/scene09.cpp @@ -416,6 +416,10 @@ void sceneHandler09_hangerStartCycle() { } } +void scene09_visCallback(int *phase) { + // do nothing +} + int sceneHandler09(ExCommand *cmd) { if (cmd->_messageKind != 17) return 0; @@ -499,7 +503,7 @@ int sceneHandler09(ExCommand *cmd) { case 30: if (g_vars->scene09_interactingHanger >= 0) { if (ABS(g_vars->scene09_hangers[g_vars->scene09_interactingHanger]->phase) < 15) { - g_vars->scene09_hangers[g_vars->scene09_interactingHanger]->ani->_callback2 = 0; + g_vars->scene09_hangers[g_vars->scene09_interactingHanger]->ani->_callback2 = 0; // Really NULL g_vars->scene09_hangers[g_vars->scene09_interactingHanger]->ani->changeStatics2(ST_VSN_NORMAL); } } @@ -540,7 +544,7 @@ int sceneHandler09(ExCommand *cmd) { if (!g_vars->scene09_hangers[hng]->ani->_movement || g_vars->scene09_hangers[hng]->ani->_movement->_id != MV_VSN_CYCLE2) { g_vars->scene09_hangers[hng]->ani->changeStatics2(ST_VSN_NORMAL); g_vars->scene09_hangers[hng]->ani->startAnim(MV_VSN_CYCLE2, 0, -1); - g_vars->scene09_hangers[hng]->ani->_callback2 = 0; + g_vars->scene09_hangers[hng]->ani->_callback2 = scene09_visCallback; } ExCommand *ex = new ExCommand(0, 35, SND_9_018, 0, 0, 0, 1, 0, 0, 0); diff --git a/engines/fullpipe/scenes/scene13.cpp b/engines/fullpipe/scenes/scene13.cpp index 39b31b3793..7b38442603 100644 --- a/engines/fullpipe/scenes/scene13.cpp +++ b/engines/fullpipe/scenes/scene13.cpp @@ -60,7 +60,7 @@ void scene13_initScene(Scene *sc) { g_fp->playSound(SND_13_018, 1); - g_vars->scene13_whirlgig->_callback2 = 0; + g_vars->scene13_whirlgig->_callback2 = 0; // Really NULL } else { g_vars->scene13_bridge->changeStatics2(ST_BDG_OPEN2); @@ -167,7 +167,7 @@ void sceneHandler13_stopWhirlgig() { } void sceneHandler13_startWhirlgig() { - g_vars->scene13_whirlgig->_callback2 = 0; + g_vars->scene13_whirlgig->_callback2 = 0; // Really NULL g_fp->playSound(SND_13_018, 1); g_fp->playSound(SND_13_034, 0); diff --git a/engines/fullpipe/scenes/scene14.cpp b/engines/fullpipe/scenes/scene14.cpp index 2ebb82abcf..d5070bb17b 100644 --- a/engines/fullpipe/scenes/scene14.cpp +++ b/engines/fullpipe/scenes/scene14.cpp @@ -380,7 +380,7 @@ void sceneHandler14_startArcade() { } void sceneHandler14_clearCallback() { - g_fp->_aniMan->_callback2 = 0; + g_fp->_aniMan->_callback2 = 0; // Really NULL g_vars->scene14_dudeIsKicking = false; } diff --git a/engines/fullpipe/scenes/scene27.cpp b/engines/fullpipe/scenes/scene27.cpp index a6ddbab5e3..aaf7fab852 100644 --- a/engines/fullpipe/scenes/scene27.cpp +++ b/engines/fullpipe/scenes/scene27.cpp @@ -124,7 +124,7 @@ void sceneHandler27_winArcade() { if (g_fp->getObjectState(sO_Driver) == g_fp->getObjectEnumState(sO_Driver, sO_WithSteering)) { g_vars->scene27_dudeIsAiming = false; - g_fp->_aniMan->_callback2 = 0; + g_fp->_aniMan->_callback2 = 0; // Really NULL g_fp->_aniMan->changeStatics2(ST_MAN_RIGHT); sceneHandler27_driverGiveVent(); @@ -248,7 +248,7 @@ void sceneHandler27_startAiming() { g_vars->scene27_dudeIsAiming = false; g_vars->scene27_maxPhaseReached = false; - g_fp->_aniMan->_callback2 = 0; + g_fp->_aniMan->_callback2 = 0; // Really NULL g_vars->scene27_launchPhase = g_fp->_aniMan->_movement->_currDynamicPhaseIndex - 6; diff --git a/engines/fullpipe/statics.cpp b/engines/fullpipe/statics.cpp index bf769e2f61..ece4f43e9f 100644 --- a/engines/fullpipe/statics.cpp +++ b/engines/fullpipe/statics.cpp @@ -137,8 +137,8 @@ StaticANIObject::StaticANIObject() { _movement = 0; _statics = 0; _flags = 0; - _callback1 = 0; - _callback2 = 0; + _callback1 = 0; // Really NULL + _callback2 = 0; // Really NULL _sceneId = -1; _someDynamicPhaseIndex = -1; |