diff options
author | Thanasis Antoniou | 2019-07-22 01:08:23 +0300 |
---|---|---|
committer | Thanasis Antoniou | 2019-07-22 01:09:23 +0300 |
commit | af9ec2f69139d74a697b6e534d31c8f31e1ce587 (patch) | |
tree | c521d71c82aa8a4a7adc3ef05225a11da9c4edb1 /engines/bladerunner/script | |
parent | 4e16711e478d416846502164864faa31bc59fa7b (diff) | |
download | scummvm-rg350-af9ec2f69139d74a697b6e534d31c8f31e1ce587.tar.gz scummvm-rg350-af9ec2f69139d74a697b6e534d31c8f31e1ce587.tar.bz2 scummvm-rg350-af9ec2f69139d74a697b6e534d31c8f31e1ce587.zip |
BLADERUNNER: Revert uint32 vars to int32 if they could be init to -1
Diffstat (limited to 'engines/bladerunner/script')
-rw-r--r-- | engines/bladerunner/script/scene/ct01.cpp | 4 | ||||
-rw-r--r-- | engines/bladerunner/script/scene/dr06.cpp | 2 | ||||
-rw-r--r-- | engines/bladerunner/script/scene/nr10.cpp | 2 | ||||
-rw-r--r-- | engines/bladerunner/script/scene/rc02.cpp | 4 | ||||
-rw-r--r-- | engines/bladerunner/script/scene/ug16.cpp | 2 | ||||
-rw-r--r-- | engines/bladerunner/script/script.cpp | 38 | ||||
-rw-r--r-- | engines/bladerunner/script/script.h | 14 |
7 files changed, 33 insertions, 33 deletions
diff --git a/engines/bladerunner/script/scene/ct01.cpp b/engines/bladerunner/script/scene/ct01.cpp index a1a63bf22e..e58f270053 100644 --- a/engines/bladerunner/script/scene/ct01.cpp +++ b/engines/bladerunner/script/scene/ct01.cpp @@ -534,8 +534,8 @@ void SceneScriptCT01::PlayerWalkedIn() { void SceneScriptCT01::PlayerWalkedOut() { Ambient_Sounds_Remove_All_Non_Looping_Sounds(true); if (Game_Flag_Query(kFlagCT01toCT12)) { - Ambient_Sounds_Remove_Looping_Sound(kSfxCTAMBL1, true); - Ambient_Sounds_Remove_Looping_Sound(kSfxCTAMBR1, true); + Ambient_Sounds_Remove_Looping_Sound(kSfxCTAMBL1, 1); + Ambient_Sounds_Remove_Looping_Sound(kSfxCTAMBR1, 1); } else { Ambient_Sounds_Remove_All_Looping_Sounds(1); } diff --git a/engines/bladerunner/script/scene/dr06.cpp b/engines/bladerunner/script/scene/dr06.cpp index 037f10dcf4..0d788ba124 100644 --- a/engines/bladerunner/script/scene/dr06.cpp +++ b/engines/bladerunner/script/scene/dr06.cpp @@ -85,7 +85,7 @@ bool SceneScriptDR06::ClickedOn3DObject(const char *objectName, bool a2) { Game_Flag_Set(kFlagDR06JesterActive); } else { Overlay_Play("DR06over", 0, true, true, 0); - Ambient_Sounds_Remove_Looping_Sound(kSfxJESTMOV1, false); + Ambient_Sounds_Remove_Looping_Sound(kSfxJESTMOV1, 0); Game_Flag_Reset(kFlagDR06JesterActive); } return true; diff --git a/engines/bladerunner/script/scene/nr10.cpp b/engines/bladerunner/script/scene/nr10.cpp index 270feb50e9..778f19d33c 100644 --- a/engines/bladerunner/script/scene/nr10.cpp +++ b/engines/bladerunner/script/scene/nr10.cpp @@ -81,7 +81,7 @@ bool SceneScriptNR10::ClickedOn3DObject(const char *objectName, bool combatMode) Game_Flag_Reset(kFlagNR10McCoyBlinded); Actor_Set_Invisible(kActorMcCoy, false); Actor_Set_Invisible(kActorDektora, false); - Ambient_Sounds_Remove_Looping_Sound(kSfx35MM, true); + Ambient_Sounds_Remove_Looping_Sound(kSfx35MM, 1); Sound_Play(kSfx35MMBRK1, 52, 0, 0, 50); Scene_Loop_Set_Default(0); Scene_Loop_Start_Special(kSceneLoopModeOnce, 0, true); diff --git a/engines/bladerunner/script/scene/rc02.cpp b/engines/bladerunner/script/scene/rc02.cpp index 84b67d9f77..e307fdf1dc 100644 --- a/engines/bladerunner/script/scene/rc02.cpp +++ b/engines/bladerunner/script/scene/rc02.cpp @@ -416,8 +416,8 @@ bool SceneScriptRC02::ClickedOnExit(int exitId) { if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -71.51f, -1238.89f, 108587.15f, 0, true, false, false)) { Game_Flag_Set(kFlagRC02toRC01); Ambient_Sounds_Remove_All_Non_Looping_Sounds(true); - Ambient_Sounds_Remove_Looping_Sound(kSfxBRBED5, true); - Ambient_Sounds_Remove_Looping_Sound(kSfxWINDLOP8, true); + Ambient_Sounds_Remove_Looping_Sound(kSfxBRBED5, 1); + Ambient_Sounds_Remove_Looping_Sound(kSfxWINDLOP8, 1); Ambient_Sounds_Adjust_Looping_Sound(kSfxRCRAIN1, 100, -101, 1); Actor_Set_Goal_Number(kActorRunciter, kGoalRunciterDefault); Set_Enter(kSetRC01, kSceneRC01); diff --git a/engines/bladerunner/script/scene/ug16.cpp b/engines/bladerunner/script/scene/ug16.cpp index b1dbdda0f4..b6f5c21553 100644 --- a/engines/bladerunner/script/scene/ug16.cpp +++ b/engines/bladerunner/script/scene/ug16.cpp @@ -185,7 +185,7 @@ bool SceneScriptUG16::ClickedOn2DRegion(int region) { void SceneScriptUG16::SceneFrameAdvanced(int frame) { if (frame == 132) { - Ambient_Sounds_Remove_Looping_Sound(kSfxELECLAB1, true); + Ambient_Sounds_Remove_Looping_Sound(kSfxELECLAB1, 1); } } diff --git a/engines/bladerunner/script/script.cpp b/engines/bladerunner/script/script.cpp index d0355d3289..d8faa02f0d 100644 --- a/engines/bladerunner/script/script.cpp +++ b/engines/bladerunner/script/script.cpp @@ -1139,8 +1139,8 @@ void ScriptBase::Footstep_Sound_Override_Off() { _vm->_scene->_set->resetFoodstepSoundOverride(); } -bool ScriptBase::Music_Play(int musicId, int volume, int pan, uint32 timeFadeIn, uint32 timePlay, int loop, uint32 timeFadeOut) { - debugC(kDebugScript, "Music_Play(%d, %d, %d, %u, %u, %d, %u)", musicId, volume, pan, timeFadeIn, timePlay, loop, timeFadeOut); +bool ScriptBase::Music_Play(int musicId, int volume, int pan, int32 timeFadeIn, int32 timePlay, int loop, int32 timeFadeOut) { + debugC(kDebugScript, "Music_Play(%d, %d, %d, %d, %d, %d, %d)", musicId, volume, pan, timeFadeIn, timePlay, loop, timeFadeOut); return _vm->_music->play(_vm->_gameInfo->getMusicTrack(musicId), volume, pan, timeFadeIn, timePlay, loop, timeFadeOut); } @@ -1657,8 +1657,8 @@ void ScriptBase::ADQ_Add(int actorId, int sentenceId, int animationMode) { _vm->_actorDialogueQueue->add(actorId, sentenceId, animationMode); } -void ScriptBase::ADQ_Add_Pause(uint32 delay) { - debugC(kDebugScript, "ADQ_Add_Pause(%u)", delay); +void ScriptBase::ADQ_Add_Pause(int32 delay) { + debugC(kDebugScript, "ADQ_Add_Pause(%d)", delay); _vm->_actorDialogueQueue->addPause(delay); } @@ -1684,10 +1684,10 @@ void ScriptBase::I_Sez(const char *str) { _vm->ISez(str); } -void ScriptBase::AI_Countdown_Timer_Start(int actorId, signed int timer, uint32 seconds) { - debugC(kDebugScript, "AI_Countdown_Timer_Start(%d, %d, %u)", actorId, timer, seconds); +void ScriptBase::AI_Countdown_Timer_Start(int actorId, signed int timer, int32 seconds) { + debugC(kDebugScript, "AI_Countdown_Timer_Start(%d, %d, %d)", actorId, timer, seconds); if (timer >= 0 && timer <= 2) { - _vm->_actors[actorId]->timerStart(timer, 1000u * seconds); + _vm->_actors[actorId]->timerStart(timer, 1000 * seconds); } } @@ -1714,24 +1714,24 @@ void ScriptBase::AI_Movement_Track_Repeat(int actorId) { _vm->_actors[actorId]->movementTrackNext(true); } -void ScriptBase::AI_Movement_Track_Append_Run_With_Facing(int actorId, int waypointId, uint32 delay, int angle) { - debugC(kDebugScript, "AI_Movement_Track_Append_Run_With_Facing(%d, %d, %u, %d)", actorId, waypointId, delay, angle); - _vm->_actors[actorId]->_movementTrack->append(waypointId, delay * 1000u, angle, true); +void ScriptBase::AI_Movement_Track_Append_Run_With_Facing(int actorId, int waypointId, int32 delay, int angle) { + debugC(kDebugScript, "AI_Movement_Track_Append_Run_With_Facing(%d, %d, %d, %d)", actorId, waypointId, delay, angle); + _vm->_actors[actorId]->_movementTrack->append(waypointId, delay * 1000, angle, true); } -void ScriptBase::AI_Movement_Track_Append_With_Facing(int actorId, int waypointId, uint32 delay, int angle) { - debugC(kDebugScript, "AI_Movement_Track_Append_With_Facing(%d, %d, %u, %d)", actorId, waypointId, delay, angle); - _vm->_actors[actorId]->_movementTrack->append(waypointId, delay * 1000u, angle, false); +void ScriptBase::AI_Movement_Track_Append_With_Facing(int actorId, int waypointId, int32 delay, int angle) { + debugC(kDebugScript, "AI_Movement_Track_Append_With_Facing(%d, %d, %d, %d)", actorId, waypointId, delay, angle); + _vm->_actors[actorId]->_movementTrack->append(waypointId, delay * 1000, angle, false); } -void ScriptBase::AI_Movement_Track_Append_Run(int actorId, int waypointId, uint32 delay) { - debugC(kDebugScript, "AI_Movement_Track_Append_Run(%d, %d, %u)", actorId, waypointId, delay); - _vm->_actors[actorId]->_movementTrack->append(waypointId, delay * 1000u, true); +void ScriptBase::AI_Movement_Track_Append_Run(int actorId, int waypointId, int32 delay) { + debugC(kDebugScript, "AI_Movement_Track_Append_Run(%d, %d, %d)", actorId, waypointId, delay); + _vm->_actors[actorId]->_movementTrack->append(waypointId, delay * 1000, true); } -void ScriptBase::AI_Movement_Track_Append(int actorId, int waypointId, uint32 delay) { - debugC(kDebugScript, "AI_Movement_Track_Append(%d, %d, %u)", actorId, waypointId, delay); - _vm->_actors[actorId]->_movementTrack->append(waypointId, delay * 1000u, false); +void ScriptBase::AI_Movement_Track_Append(int actorId, int waypointId, int32 delay) { + debugC(kDebugScript, "AI_Movement_Track_Append(%d, %d, %d)", actorId, waypointId, delay); + _vm->_actors[actorId]->_movementTrack->append(waypointId, delay * 1000, false); } void ScriptBase::AI_Movement_Track_Flush(int actorId) { diff --git a/engines/bladerunner/script/script.h b/engines/bladerunner/script/script.h index ac88458f42..4eb929004b 100644 --- a/engines/bladerunner/script/script.h +++ b/engines/bladerunner/script/script.h @@ -172,7 +172,7 @@ protected: void Footstep_Sounds_Set(int index, int value); void Footstep_Sound_Override_On(int footstepSoundOverride); void Footstep_Sound_Override_Off(); - bool Music_Play(int musicId, int volume, int pan, uint32 timeFadeIn, uint32 timePlay, int loop, uint32 timeFadeOut); + bool Music_Play(int musicId, int volume, int pan, int32 timeFadeIn, int32 timePlay, int loop, int32 timeFadeOut); void Music_Adjust(int volume, int pan, uint32 delay); void Music_Stop(uint32 delay); bool Music_Is_Playing(); @@ -265,21 +265,21 @@ protected: void Set_Fog_Density(const char *fogName, float density); void ADQ_Flush(); void ADQ_Add(int actorId, int sentenceId, int animationMode); - void ADQ_Add_Pause(uint32 delay); + void ADQ_Add_Pause(int32 delay); void ADQ_Wait_For_All_Queued_Dialogue(); bool Game_Over(); void Autosave_Game(int textId); void I_Sez(const char *str); - void AI_Countdown_Timer_Start(int actorId, signed int timer, uint32 seconds); + void AI_Countdown_Timer_Start(int actorId, signed int timer, int32 seconds); void AI_Countdown_Timer_Reset(int actorId, int timer); void AI_Movement_Track_Unpause(int actorId); void AI_Movement_Track_Pause(int actorId); void AI_Movement_Track_Repeat(int actorId); - void AI_Movement_Track_Append_Run_With_Facing(int actorId, int waypointId, uint32 delay, int angle); - void AI_Movement_Track_Append_With_Facing(int actorId, int waypointId, uint32 delay, int angle); - void AI_Movement_Track_Append_Run(int actorId, int waypointId, uint32 delay); - void AI_Movement_Track_Append(int actorId, int waypointId, uint32 delay); + void AI_Movement_Track_Append_Run_With_Facing(int actorId, int waypointId, int32 delay, int angle); + void AI_Movement_Track_Append_With_Facing(int actorId, int waypointId, int32 delay, int angle); + void AI_Movement_Track_Append_Run(int actorId, int waypointId, int32 delay); + void AI_Movement_Track_Append(int actorId, int waypointId, int32 delay); void AI_Movement_Track_Flush(int actorId); void ESPER_Add_Photo(const char *name, int photoId, int shapeId); |