diff options
author | Peter Kohaut | 2019-02-24 00:36:41 +0100 |
---|---|---|
committer | Peter Kohaut | 2019-02-24 00:36:41 +0100 |
commit | 5f520aa386d829f2bbb168f31318f3422ecf01f1 (patch) | |
tree | 40c724f5fbde52d2b6cd0d1b61764f7e29aaf529 /engines/bladerunner/script/ai | |
parent | 25c48ac33161130d1e63af3664db6ff6b4b234a6 (diff) | |
download | scummvm-rg350-5f520aa386d829f2bbb168f31318f3422ecf01f1.tar.gz scummvm-rg350-5f520aa386d829f2bbb168f31318f3422ecf01f1.tar.bz2 scummvm-rg350-5f520aa386d829f2bbb168f31318f3422ecf01f1.zip |
BLADERUNNER: Small clean-up of macros
Diffstat (limited to 'engines/bladerunner/script/ai')
-rw-r--r-- | engines/bladerunner/script/ai/moraji.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/engines/bladerunner/script/ai/moraji.cpp b/engines/bladerunner/script/ai/moraji.cpp index 0c07d3c9b0..e1180a8eb3 100644 --- a/engines/bladerunner/script/ai/moraji.cpp +++ b/engines/bladerunner/script/ai/moraji.cpp @@ -152,11 +152,11 @@ bool AIScriptMoraji::GoalChanged(int currentGoalNumber, int newGoalNumber) { case kGoalMorajiShot: // applies only when shot inside the Dermo Design Lab Actor_Set_Targetable(kActorMoraji, false); - #if BLADE_RUNNER_ORIGINAL_BUGS +#if BLADERUNNER_ORIGINAL_BUGS Sound_Play(4, 100, 0, 0, 50); // Original code has female scream here (FEMHURT2) - #else +#else Sound_Play_Speech_Line(kActorMoraji, 9020, 50, 0, 50); // fix: Use Moraji's death SPCHSFX, also lower volume - #endif // BLADE_RUNNER_ORIGINAL_BUGS +#endif // BLADERUNNER_ORIGINAL_BUGS _animationState = 10; _animationFrame = 0; Actor_Retired_Here(kActorMoraji, 60, 16, true, -1); @@ -192,11 +192,11 @@ bool AIScriptMoraji::GoalChanged(int currentGoalNumber, int newGoalNumber) { // Added check here to have Moraji death speech SFX // when shot by McCoy outside the Dermo Design Lab if (Game_Flag_Query(kFlagDR04McCoyShotMoraji)) { - #if BLADE_RUNNER_ORIGINAL_BUGS +#if BLADERUNNER_ORIGINAL_BUGS // original code uses no voice here - #else +#else Sound_Play_Speech_Line(kActorMoraji, 9020, 50, 0, 50); // Use Moraji's death SPCHSFX, also lower volume - #endif // BLADE_RUNNER_ORIGINAL_BUGS +#endif // BLADERUNNER_ORIGINAL_BUGS } _animationFrame = -1; _animationState = 13; |