From 120955b9a286ffb245b15c83289d931794f1820c Mon Sep 17 00:00:00 2001 From: Thanasis Antoniou Date: Wed, 20 Mar 2019 14:06:18 +0200 Subject: BLADERUNNER: Fixes and cleanup for Police Maze C First pass of all rooms is complete. A second pass is pending where the special targets will be restored --- engines/bladerunner/script/scene/ps10.cpp | 74 ++++++------- engines/bladerunner/script/scene/ps11.cpp | 43 ++++---- engines/bladerunner/script/scene/ps12.cpp | 35 +++--- engines/bladerunner/script/scene/ps13.cpp | 171 +++++++++++++++++++++++++----- 4 files changed, 222 insertions(+), 101 deletions(-) (limited to 'engines') diff --git a/engines/bladerunner/script/scene/ps10.cpp b/engines/bladerunner/script/scene/ps10.cpp index e2d7f8f2bd..8965bf8b1f 100644 --- a/engines/bladerunner/script/scene/ps10.cpp +++ b/engines/bladerunner/script/scene/ps10.cpp @@ -29,7 +29,7 @@ int SceneScriptPS10::getPoliceMazePS10TargetCount() { return kPoliceMazePS10TargetCount; } -static const int *getPoliceMazePS10TrackData1() { // Enemy (kItemPS10Target1, kItemPS10Target2) +static const int *getPoliceMazePS10TrackData1() { // Enemy (kItemPS10Target1, kItemPS10Target2) - Rotating reveal static int trackData[] = { kPMTIActivate, kVariablePoliceMazePS10TargetCounter, kPoliceMazePS10TargetCount, kPMTIVariableInc, kVariablePoliceMazePS10TargetCounter, kPoliceMazePS10TargetCount, @@ -51,11 +51,11 @@ static const int *getPoliceMazePS10TrackData1() { // Enemy (kItemPS10Target1, k #endif // BLADERUNNER_ORIGINAL_BUGS kPMTIWaitRandom, 3000, 5000, kPMTIObstacleSet, kItemPS10Target1, - kPMTIPlaySound, 159, 100, // UPTARG3 + kPMTIPlaySound, 159, 100, kPMTIMove, 14, kPMTIWait, 1000, kPMTIRotate, 740, 80, - kPMTIEnemySet, kItemPS10Target1, // Target becomes enemy after rotating + kPMTIEnemySet, kItemPS10Target1, // rotate - reveal #if BLADERUNNER_ORIGINAL_BUGS #else kPMTIEnemySet, kItemPS10Target2, // both targets should set their enemy flag here @@ -84,13 +84,13 @@ static const int *getPoliceMazePS10TrackData2() { // Enemy (kItemPS10Target1, k static int trackData[] = { kPMTIFacing, 740, kPMTIPosition, 0, - kPMTIEnemySet, kItemPS10Target2, + kPMTIEnemySet, kItemPS10Target2, // [redundant after bug fix] kPMTIMove, 69, kPMTIWait, 500, kPMTIObstacleReset, kItemPS10Target2, #if BLADERUNNER_ORIGINAL_BUGS #else - kPMTITargetSet, kItemPS10Target2, 0, // remove target-able here - only for Target1 item + kPMTITargetSet, kItemPS10Target2, 0, // remove target-able here - only for Target2 item #endif // BLADERUNNER_ORIGINAL_BUGS kPMTIPausedReset, kItemPS10Target5, kPMTIPausedSet, kItemPS10Target2, @@ -101,7 +101,7 @@ static const int *getPoliceMazePS10TrackData2() { // Enemy (kItemPS10Target1, k } // NOTE Track 3 is used only once as is; it's activated when entering the room -static const int *getPoliceMazePS10TrackData3() { // Enemy (kItemPS10Target3) - Starts activated +static const int *getPoliceMazePS10TrackData3() { // Enemy (kItemPS10Target3) - Starts activated - Rotating reveal static int trackData[] = { kPMTIActivate, kVariablePoliceMazePS10TargetCounter, kPoliceMazePS10TargetCount, kPMTIVariableInc, kVariablePoliceMazePS10TargetCounter, kPoliceMazePS10TargetCount, @@ -114,12 +114,12 @@ static const int *getPoliceMazePS10TrackData3() { // Enemy (kItemPS10Target3) - kPMTIPosition, 0, kPMTIWaitRandom, 3000, 5000, kPMTIObstacleSet, kItemPS10Target3, - kPMTIPlaySound, 159, 100, // UPTARG3 + kPMTIPlaySound, 159, 100, kPMTITargetSet, kItemPS10Target3, 1, kPMTIEnemyReset, kItemPS10Target3, kPMTIMove, 5, kPMTIWait, 1000, - kPMTIEnemySet, kItemPS10Target3, + kPMTIEnemySet, kItemPS10Target3, // rotate - reveal kPMTIRotate, 233, 80, kPMTIWait, 0, kPMTIRotate, 491, 80, @@ -129,7 +129,7 @@ static const int *getPoliceMazePS10TrackData3() { // Enemy (kItemPS10Target3) - kPMTIRotate, 233, 80, kPMTIWait, 0, kPMTIRotate, 993, 80, - kPMTIPlaySound, 34, 33, // TARGUP6 + kPMTIPlaySound, 34, 33, kPMTIMove, 0, kPMTIObstacleReset, kItemPS10Target3, #if BLADERUNNER_ORIGINAL_BUGS @@ -155,7 +155,7 @@ static const int *getPoliceMazePS10TrackData4() { // Innocent (kItemPS10Target4 kPMTIPosition, 0, kPMTIWaitRandom, 3000, 6000, kPMTIObstacleSet, kItemPS10Target4, - kPMTIPlaySound, 159, 100, // UPTARG3 + kPMTIPlaySound, 159, 100, kPMTITargetSet, kItemPS10Target4, 1, kPMTIEnemyReset, kItemPS10Target4, kPMTIMove, 34, @@ -188,7 +188,7 @@ static const int *getPoliceMazePS10TrackData5() { // Innocent (kItemPS10Target5 kPMTIPosition, 0, kPMTIWaitRandom, 4000, 6000, kPMTIObstacleSet, kItemPS10Target5, - kPMTIPlaySound, 159, 100, // UPTARG3 + kPMTIPlaySound, 159, 100, kPMTITargetSet, kItemPS10Target5, 1, kPMTIEnemyReset, kItemPS10Target5, kPMTIMove, 5, @@ -196,7 +196,7 @@ static const int *getPoliceMazePS10TrackData5() { // Innocent (kItemPS10Target5 kPMTIRotate, 512, 100, kPMTIWait, 2000, kPMTIRotate, 0, -100, - kPMTIPlaySound, 34, 33, // TARGUP6 + kPMTIPlaySound, 34, 33, kPMTIMove, 0, kPMTILeave, kPMTIObstacleReset, kItemPS10Target5, @@ -212,7 +212,7 @@ static const int *getPoliceMazePS10TrackData5() { // Innocent (kItemPS10Target5 } // NOTE Track 6 is used only once as is; it's activated when entering the room -static const int *getPoliceMazePS10TrackData6() { // Enemy (kItemPS10Target6) - Starts activated +static const int *getPoliceMazePS10TrackData6() { // Enemy (kItemPS10Target6) - Starts activated - Rotating reveal static int trackData[] = { kPMTIActivate, kVariablePoliceMazePS10TargetCounter, kPoliceMazePS10TargetCount, kPMTIVariableInc, kVariablePoliceMazePS10TargetCounter, kPoliceMazePS10TargetCount, @@ -225,22 +225,22 @@ static const int *getPoliceMazePS10TrackData6() { // Enemy (kItemPS10Target6) - kPMTIPosition, 0, kPMTIWaitRandom, 4000, 6000, kPMTIObstacleSet, kItemPS10Target6, - kPMTIPlaySound, 159, 100, // UPTARG3 + kPMTIPlaySound, 159, 100, kPMTITargetSet, kItemPS10Target6, 1, kPMTIEnemyReset, kItemPS10Target6, kPMTIMove, 7, kPMTIWait, 500, - kPMTIEnemySet, kItemPS10Target6, + kPMTIEnemySet, kItemPS10Target6, // rotate - reveal kPMTIRotate, 750, 80, kPMTIWait, 0, kPMTIRotate, 500, 80, kPMTIWait, 1000, - kPMTIShoot, 27, 33, // SMCAL3 + kPMTIShoot, 27, 33, kPMTIWait, 0, kPMTIRotate, 750, 80, kPMTIWait, 0, kPMTIRotate, 999, 80, - kPMTIPlaySound, 34, 33, // TARGUP6 + kPMTIPlaySound, 34, 33, kPMTIMove, 0, kPMTIObstacleReset, kItemPS10Target6, #if BLADERUNNER_ORIGINAL_BUGS @@ -286,7 +286,7 @@ static const int *getPoliceMazePS10TrackData7() { // Innocent (kItemPS10Target7 return trackData; } -static const int *getPoliceMazePS10TrackData8() { // Enemy (kItemPS10Target8) - Starts activated +static const int *getPoliceMazePS10TrackData8() { // Enemy (kItemPS10Target8) - Starts activated - Rotating reveal static int trackData[] = { kPMTIActivate, kVariablePoliceMazePS10TargetCounter, kPoliceMazePS10TargetCount, kPMTIVariableInc, kVariablePoliceMazePS10TargetCounter, kPoliceMazePS10TargetCount, @@ -299,12 +299,12 @@ static const int *getPoliceMazePS10TrackData8() { // Enemy (kItemPS10Target8) - kPMTIPosition, 0, kPMTIWaitRandom, 4000, 6000, kPMTIObstacleSet, kItemPS10Target8, - kPMTIPlaySound, 159, 100, // UPTARG3 + kPMTIPlaySound, 159, 100, kPMTITargetSet, kItemPS10Target8, 1, kPMTIEnemyReset, kItemPS10Target8, kPMTIMove, 34, kPMTIWait, 500, - kPMTIEnemySet, kItemPS10Target8, + kPMTIEnemySet, kItemPS10Target8, // rotate - reveal kPMTIRotate, 491, 80, kPMTIMove, 20, kPMTIWait, 0, @@ -322,7 +322,7 @@ static const int *getPoliceMazePS10TrackData8() { // Enemy (kItemPS10Target8) - return trackData; } -static const int *getPoliceMazePS10TrackData9() { // Enemy (kItemPS10Target9) +static const int *getPoliceMazePS10TrackData9() { // Special (kItemPS10Target9) - Enemy x2 static int trackData[] = { kPMTIActivate, kVariablePoliceMazePS10TargetCounter, kPoliceMazePS10TargetCount, kPMTIVariableInc, kVariablePoliceMazePS10TargetCounter, kPoliceMazePS10TargetCount, @@ -333,46 +333,46 @@ static const int *getPoliceMazePS10TrackData9() { // Enemy (kItemPS10Target9) kPMTITargetSet, kItemPS10Target9, 1, kPMTIEnemySet, kItemPS10Target9, kPMTIObstacleSet, kItemPS10Target9, - kPMTIPlaySound, 0, 33, // CROSLOCK + kPMTIPlaySound, 0, 33, kPMTIMove, 23, - kPMTIPlaySound, 0, 33, // CROSLOCK + kPMTIPlaySound, 0, 33, kPMTIWait, 200, - kPMTIPlaySound, 32, 33, // TARGUP4 + kPMTIPlaySound, 32, 33, kPMTIRotate, 498, 100, - kPMTIPlaySound, 0, 33, // CROSLOCK + kPMTIPlaySound, 0, 33, kPMTIWait, 100, kPMTIShoot, 27, 33, - kPMTIPlaySound, 32, 33, // TARGUP4 + kPMTIPlaySound, 32, 33, kPMTIMove, 35, - kPMTIPlaySound, 32, 33, // TARGUP4 + kPMTIPlaySound, 32, 33, kPMTIWait, 100, kPMTIShoot, 27, 33, - kPMTIPlaySound, 0, 33, // CROSLOCK + kPMTIPlaySound, 0, 33, kPMTIMove, 23, - kPMTIPlaySound, 32, 33, // TARGUP4 + kPMTIPlaySound, 32, 33, kPMTIWait, 100, kPMTIShoot, 27, 33, - kPMTIPlaySound, 32, 33, // TARGUP4 + kPMTIPlaySound, 32, 33, kPMTIRotate, 758, 100, - kPMTIPlaySound, 32, 33, // TARGUP4 + kPMTIPlaySound, 32, 33, kPMTIMove, 89, - kPMTIPlaySound, 0, 33, // CROSLOCK + kPMTIPlaySound, 0, 33, kPMTIWaitRandom, 4000, 6000, #if BLADERUNNER_ORIGINAL_BUGS - kPMTITargetSet, kItemPS10Target9, 1, // TODO MAZE A bug? intended? why reset the target-able status (even if shot) here? (would result to re-credit another point if shot again now) + kPMTITargetSet, kItemPS10Target9, 1, // TODO MAZE A bug? intended? "second" enemy kPMTIEnemySet, kItemPS10Target9, #endif // BLADERUNNER_ORIGINAL_BUGS kPMTIFacing, 216, - kPMTIPlaySound, 32, 33, // TARGUP4 + kPMTIPlaySound, 32, 33, kPMTIMove, 69, kPMTIWait, 100, - kPMTIPlaySound, 32, 33, // TARGUP4 + kPMTIPlaySound, 32, 33, kPMTIRotate, 498, 100, kPMTIWait, 100, kPMTIShoot, 27, 33, - kPMTIPlaySound, 0, 33, // CROSLOCK + kPMTIPlaySound, 0, 33, kPMTIRotate, 216, 100, - kPMTIPlaySound, 32, 33, // TARGUP4 + kPMTIPlaySound, 32, 33, kPMTIMove, 0, kPMTIObstacleReset, kItemPS10Target9, kPMTIPausedSet, kItemPS10Target9, diff --git a/engines/bladerunner/script/scene/ps11.cpp b/engines/bladerunner/script/scene/ps11.cpp index f5f1e7a311..aa66f4751b 100644 --- a/engines/bladerunner/script/scene/ps11.cpp +++ b/engines/bladerunner/script/scene/ps11.cpp @@ -51,7 +51,6 @@ static const int *getPoliceMazePS11TrackData9() { // Enemy (kItemPS11Target1) #if BLADERUNNER_ORIGINAL_BUGS #else kPMTITargetSet, kItemPS11Target1, 0, // remove target-able here - kPMTIEnemyReset, kItemPS11Target1, #endif // BLADERUNNER_ORIGINAL_BUGS kPMTIObstacleReset, kItemPS11Target1, kPMTIFacing, 50, @@ -79,7 +78,7 @@ static const int *getPoliceMazePS11TrackData9() { // Enemy (kItemPS11Target1) return trackData; } -static const int *getPoliceMazePS11TrackData10() { // Enemy (kItemPS11Target2, kItemPS11Target3) +static const int *getPoliceMazePS11TrackData10() { // Enemy (kItemPS11Target2, kItemPS11Target3) - Rotating reveal (as kItemPS11Target3) static int trackData[] = { kPMTIActivate, kVariablePoliceMazePS11TargetCounter, kPoliceMazePS11TargetCount, kPMTIVariableInc, kVariablePoliceMazePS11TargetCounter, kPoliceMazePS11TargetCount, @@ -126,7 +125,7 @@ static const int *getPoliceMazePS11TrackData11() { // Enemy (kItemPS11Target2, kPMTIEnemyReset, kItemPS11Target3, // [redundant after bug fix] target 2-3 still is not revealed as enemy kPMTIMove, 25, kPMTIWait, 500, - kPMTIEnemySet, kItemPS11Target3, // no need to set target 2 as enemy too, since it's gone + kPMTIEnemySet, kItemPS11Target3, // rotate - reveal -- no need to set target 2 as enemy too, since it's gone kPMTIPlaySound, 32, 33, kPMTIRotate, 644, 80, kPMTIWait, 0, @@ -198,7 +197,6 @@ static const int *getPoliceMazePS11TrackData13() { // Enemy (kItemPS11Target5) #if BLADERUNNER_ORIGINAL_BUGS #else kPMTITargetSet, kItemPS11Target5, 0, // remove target-able here - kPMTIEnemyReset, kItemPS11Target5, #endif // BLADERUNNER_ORIGINAL_BUGS kPMTIObstacleReset, kItemPS11Target5, kPMTIFacing, 340, @@ -241,7 +239,7 @@ static const int *getPoliceMazePS11TrackData13() { // Enemy (kItemPS11Target5) return trackData; } -static const int *getPoliceMazePS11TrackData14() { // Enemy (kItemPS11Target6) +static const int *getPoliceMazePS11TrackData14() { // Enemy (kItemPS11Target6) - Rotating reveal static int trackData[] = { kPMTIActivate, kVariablePoliceMazePS11TargetCounter, kPoliceMazePS11TargetCount, kPMTIVariableInc, kVariablePoliceMazePS11TargetCounter, kPoliceMazePS11TargetCount, @@ -259,10 +257,10 @@ static const int *getPoliceMazePS11TrackData14() { // Enemy (kItemPS11Target6) kPMTIPlaySound, 33, 33, kPMTIMove, 5, kPMTIWait, 500, - kPMTIEnemySet, kItemPS11Target6, + kPMTIEnemySet, kItemPS11Target6, // rotate - reveal kPMTIRotate, 644, 80, kPMTIWait, 0, - kPMTIRotate, 388, 80, + kPMTIRotate, 388, 80, // TODO fix orientation here kPMTIWait, 1000, kPMTIShoot, 27, 33, kPMTIPlaySound, 34, 33, @@ -285,8 +283,8 @@ static const int *getPoliceMazePS11TrackData15() { // Innocent (kItemPS11Target kPMTIVariableInc, kVariablePoliceMazePS11TargetCounter, kPoliceMazePS11TargetCount, #if BLADERUNNER_ORIGINAL_BUGS #else - kPMTITargetSet, kItemPS11Target7, 0, // remove target-able here - kPMTITargetSet, kItemPS11Target8, 0, // remove target-able here + kPMTITargetSet, kItemPS11Target7, 0, // remove target-able here - redundant, but consistent with the original kPMTIObstacleReset (redundant) instructions that follow + kPMTITargetSet, kItemPS11Target8, 0, // remove target-able here - redundant, but consistent with the original kPMTIObstacleReset (redundant) instructions that follow #endif // BLADERUNNER_ORIGINAL_BUGS kPMTIObstacleReset, kItemPS11Target7, kPMTIObstacleReset, kItemPS11Target8, @@ -327,7 +325,7 @@ static const int *getPoliceMazePS11TrackData16() { // Innocent (kItemPS11Target kPMTIFacing, 860, kPMTIPosition, 0, kPMTIObstacleSet, kItemPS11Target8, - kPMTIEnemyReset, kItemPS11Target8, + kPMTIEnemyReset, kItemPS11Target8, // [redundant after bug fix] kPMTIMove, 25, kPMTIWait, 500, kPMTIPlaySound, 32, 33, @@ -351,7 +349,7 @@ static const int *getPoliceMazePS11TrackData16() { // Innocent (kItemPS11Target return trackData; } -static const int *getPoliceMazePS11TrackData17() { // Enemy (kItemPS11Target9) +static const int *getPoliceMazePS11TrackData17() { // Special (kItemPS11Target9) - Enemy x3 static int trackData[] = { kPMTIActivate, kVariablePoliceMazePS11TargetCounter, kPoliceMazePS11TargetCount, kPMTIVariableInc, kVariablePoliceMazePS11TargetCounter, kPoliceMazePS11TargetCount, @@ -359,7 +357,6 @@ static const int *getPoliceMazePS11TrackData17() { // Enemy (kItemPS11Target9) #else kPMTITargetSet, kItemPS11Target9, 0, // remove target-able here kPMTIObstacleReset, kItemPS11Target9, - kPMTIEnemyReset, kItemPS11Target9, #endif // BLADERUNNER_ORIGINAL_BUGS kPMTIFacing, 310, kPMTIPosition, 0, @@ -371,8 +368,8 @@ static const int *getPoliceMazePS11TrackData17() { // Enemy (kItemPS11Target9) kPMTIWaitRandom, 4000, 8000, #if BLADERUNNER_ORIGINAL_BUGS #else - kPMTIObstacleSet, kItemPS11Target9, - kPMTITargetSet, kItemPS11Target9, 1, + kPMTIObstacleSet, kItemPS11Target9, // make visible after the wait period, not before + kPMTITargetSet, kItemPS11Target9, 1, // set Target-able after the wait period, not before #endif // BLADERUNNER_ORIGINAL_BUGS kPMTIPlaySound, 32, 33, kPMTIMove, 10, @@ -380,12 +377,12 @@ static const int *getPoliceMazePS11TrackData17() { // Enemy (kItemPS11Target9) kPMTIShoot, 27, 33, kPMTIMove, 0, #if BLADERUNNER_ORIGINAL_BUGS - kPMTITargetSet, kItemPS11Target9, 1, // TODO MAZE A bug? intended? Reseting the target-able status would result in multiple credits same target + kPMTITargetSet, kItemPS11Target9, 1, // TODO MAZE A bug? intended? - "Second" enemy kPMTIEnemySet, kItemPS11Target9, #endif // BLADERUNNER_ORIGINAL_BUGS kPMTIMove, 24, #if BLADERUNNER_ORIGINAL_BUGS - kPMTITargetSet, kItemPS11Target9, 1, // TODO MAZE A bug? intended? Reseting the target-able status would result in multiple credits same target + kPMTITargetSet, kItemPS11Target9, 1, // TODO MAZE A bug? intended? - "Third" enemy kPMTIEnemySet, kItemPS11Target9, #endif // BLADERUNNER_ORIGINAL_BUGS kPMTIMove, 10, @@ -406,7 +403,7 @@ static const int *getPoliceMazePS11TrackData17() { // Enemy (kItemPS11Target9) return trackData; } -static const int *getPoliceMazePS11TrackData18() { // Enemy (kItemPS11Target10, kItemPS11Target11) +static const int *getPoliceMazePS11TrackData18() { // Special (kItemPS11Target10, kItemPS11Target11) - Innocent x1???, then Enemy x2 static int trackData[] = { kPMTIActivate, kVariablePoliceMazePS11TargetCounter, kPoliceMazePS11TargetCount, kPMTIVariableInc, kVariablePoliceMazePS11TargetCounter, kPoliceMazePS11TargetCount, @@ -425,20 +422,20 @@ static const int *getPoliceMazePS11TrackData18() { // Enemy (kItemPS11Target10, #if BLADERUNNER_ORIGINAL_BUGS #else kPMTIEnemyReset, kItemPS11Target11, // both targets should clear their enemy flag here -#endif // BLADERUNNER_ORIGINAL_BUGS +#endif kPMTIWaitRandom, 4000, 6000, kPMTIObstacleSet, kItemPS11Target10, kPMTIMove, 5, - kPMTIPlaySound, 19, 33, // RICO3 + kPMTIPlaySound, 19, 33, #if BLADERUNNER_ORIGINAL_BUGS kPMTIPlaySound, 3, 33, // FEMHURT1 #endif // BLADERUNNER_ORIGINAL_BUGS kPMTIWait, 1000, #if BLADERUNNER_ORIGINAL_BUGS - kPMTILeave, // TODO MAZE A bug? intended? this target track is not for an innocent target, why credit a point here while the target is not revealed? + kPMTILeave, // TODO MAZE A bug? intended? Is this target not revealed yet? Credit for "first" innocent (special)? #endif // BLADERUNNER_ORIGINAL_BUGS kPMTIRotate, 700, 80, - kPMTIEnemySet, kItemPS11Target10, + kPMTIEnemySet, kItemPS11Target10, // Now the target is an enemy. (special) #if BLADERUNNER_ORIGINAL_BUGS #else kPMTIEnemySet, kItemPS11Target11, // both targets should set their enemy flag here @@ -465,11 +462,11 @@ static const int *getPoliceMazePS11TrackData19() { // Enemy (kItemPS11Target10, static int trackData[] = { kPMTIFacing, 512, kPMTIPosition, 0, - kPMTIEnemySet, kItemPS11Target11, + kPMTIEnemySet, kItemPS11Target11, // [redundant after bug fix] kPMTIMove, 8, kPMTIWait, 4000, #if BLADERUNNER_ORIGINAL_BUGS - kPMTITargetSet, kItemPS11Target11, 1, // TODO MAZE A bug? intended? + kPMTITargetSet, kItemPS11Target11, 1, // TODO MAZE A bug? intended? Now the target is reset as new enemy again (special) kPMTIEnemySet, kItemPS11Target11, #endif // BLADERUNNER_ORIGINAL_BUGS kPMTIMove, 2, diff --git a/engines/bladerunner/script/scene/ps12.cpp b/engines/bladerunner/script/scene/ps12.cpp index 81f76a96ad..738d27818d 100644 --- a/engines/bladerunner/script/scene/ps12.cpp +++ b/engines/bladerunner/script/scene/ps12.cpp @@ -101,7 +101,7 @@ static const int *getPoliceMazePS12TrackData30() { // Enemy (kItemPS12Target2) - kPMTIObstacleReset, kItemPS12Target2, kPMTIPausedReset1of2, kItemPS12Target13, kItemPS12Target11, kPMTIPausedSet, kItemPS12Target2, - kPMTITargetSet, kItemPS12Target2, 0, // remove target-able here (original code) + kPMTITargetSet, kItemPS12Target2, 0, // removes target-able here (original code) kPMTIRestart }; return trackData; @@ -220,7 +220,7 @@ static const int *getPoliceMazePS12TrackData33() { // Innocent (kItemPS12Target5 return trackData; } -static const int *getPoliceMazePS12TrackData34() { // Enemy (kItemPS12Target6, kItemPS12Target7, kItemPS12Target8) +static const int *getPoliceMazePS12TrackData34() { // Special (kItemPS12Target6, kItemPS12Target7, kItemPS12Target8) - Enemy x2 static int trackData[] = { kPMTIActivate, kVariablePoliceMazePS12TargetCounter, kPoliceMazePS12TargetCount, kPMTIVariableInc, kVariablePoliceMazePS12TargetCounter, kPoliceMazePS12TargetCount, @@ -267,12 +267,12 @@ static const int *getPoliceMazePS12TrackData34() { // Enemy (kItemPS12Target6, kPMTIPlaySound, 29, 33, kPMTIWait, 500, #if BLADERUNNER_ORIGINAL_BUGS - kPMTITargetSet, kItemPS12Target6, 1, // TODO MAZE A bug? intended? Set as target again (multiple credits issue?) - kPMTITargetSet, kItemPS12Target7, 1, // TODO MAZE A bug? intended? Set as target again (multiple credits issue?) - kPMTITargetSet, kItemPS12Target8, 1, // TODO MAZE A bug? intended? Set as target again (multiple credits issue?) - kPMTIEnemySet, kItemPS12Target6, // TODO MAZE A bug? intended? Set as target again (multiple credits issue?) - kPMTIEnemySet, kItemPS12Target7, // TODO MAZE A bug? intended? Set as target again (multiple credits issue?) - kPMTIEnemySet, kItemPS12Target8, // TODO MAZE A bug? intended? Set as target again (multiple credits issue?) + kPMTITargetSet, kItemPS12Target6, 1, // TODO MAZE A bug? intended? Set as target again ("Second" Enemy) + kPMTITargetSet, kItemPS12Target7, 1, // TODO MAZE A bug? intended? Set as target again ("Second" Enemy) + kPMTITargetSet, kItemPS12Target8, 1, // TODO MAZE A bug? intended? Set as target again ("Second" Enemy) + kPMTIEnemySet, kItemPS12Target6, // TODO MAZE A bug? intended? Set as target again ("Second" Enemy) + kPMTIEnemySet, kItemPS12Target7, // TODO MAZE A bug? intended? Set as target again ("Second" Enemy) + kPMTIEnemySet, kItemPS12Target8, // TODO MAZE A bug? intended? Set as target again ("Second" Enemy) #endif // BLADERUNNER_ORIGINAL_BUGS kPMTIRotate, 376, 80, kPMTIWait, 0, @@ -340,10 +340,10 @@ static const int *getPoliceMazePS12TrackData35() { // Enemy (kItemPS12Target6, static const int *getPoliceMazePS12TrackData36() { // Enemy (kItemPS12Target6, kItemPS12Target7, kItemPS12Target8) static int trackData[] = { - kPMTIObstacleSet, kItemPS12Target8, + kPMTIObstacleSet, kItemPS12Target8, // [redundant after bug fix] kPMTIFacing, 469, kPMTIPosition, 0, - kPMTIObstacleSet, kItemPS12Target8, + kPMTIObstacleSet, kItemPS12Target8, // redundant (original) kPMTIMove, 9, kPMTIPlaySound, 29, 33, kPMTIWait, 1000, @@ -431,13 +431,14 @@ static const int *getPoliceMazePS12TrackData38() { // Enemy (kItemPS12Target10) return trackData; } -static const int *getPoliceMazePS12TrackData39() { // Enemy (kItemPS12Target11) +static const int *getPoliceMazePS12TrackData39() { // Enemy (kItemPS12Target11) - Rotating reveal static int trackData[] = { kPMTIActivate, kVariablePoliceMazePS12TargetCounter, kPoliceMazePS12TargetCount, kPMTIVariableInc, kVariablePoliceMazePS12TargetCounter, kPoliceMazePS12TargetCount, #if BLADERUNNER_ORIGINAL_BUGS #else kPMTITargetSet, kItemPS12Target11, 0, // remove target-able here + kPMTIEnemyReset, kItemPS12Target11, #endif // BLADERUNNER_ORIGINAL_BUGS kPMTIObstacleReset, kItemPS12Target11, kPMTIFacing, 513, @@ -448,7 +449,7 @@ static const int *getPoliceMazePS12TrackData39() { // Enemy (kItemPS12Target11) kPMTITargetSet, kItemPS12Target11, 1, kPMTIMove, 5, kPMTIWait, 1000, - kPMTIEnemySet, kItemPS12Target11, + kPMTIEnemySet, kItemPS12Target11, // rotate - reveal kPMTIRotate, 1010, 80, kPMTIPlaySound, 29, 33, kPMTIWait, 500, @@ -467,13 +468,14 @@ static const int *getPoliceMazePS12TrackData39() { // Enemy (kItemPS12Target11) return trackData; } -static const int *getPoliceMazePS12TrackData40() { // Enemy (kItemPS12Target12) - Starts activated +static const int *getPoliceMazePS12TrackData40() { // Enemy (kItemPS12Target12) - Starts activated - Rotating reveal static int trackData[] = { kPMTIActivate, kVariablePoliceMazePS12TargetCounter, kPoliceMazePS12TargetCount, kPMTIVariableInc, kVariablePoliceMazePS12TargetCounter, kPoliceMazePS12TargetCount, #if BLADERUNNER_ORIGINAL_BUGS #else kPMTITargetSet, kItemPS12Target12, 0, // remove target-able here + kPMTIEnemyReset, kItemPS12Target12, #endif // BLADERUNNER_ORIGINAL_BUGS kPMTIObstacleReset, kItemPS12Target12, kPMTIFacing, 480, @@ -485,7 +487,7 @@ static const int *getPoliceMazePS12TrackData40() { // Enemy (kItemPS12Target12) kPMTIMove, 5, kPMTIPlaySound, 29, 33, kPMTIWait, 500, - kPMTIEnemySet, kItemPS12Target12, + kPMTIEnemySet, kItemPS12Target12, // rotate - reveal kPMTIRotate, 968, 80, kPMTIPlaySound, 29, 33, kPMTIWait, 1000, @@ -641,13 +643,14 @@ static const int *getPoliceMazePS12TrackData44() { // Innocent (kItemPS12Target return trackData; } -static const int *getPoliceMazePS12TrackData45() { // Enemy (kItemPS12Target17) +static const int *getPoliceMazePS12TrackData45() { // Enemy (kItemPS12Target17) - Rotating reveal static int trackData[] = { kPMTIActivate, kVariablePoliceMazePS12TargetCounter, kPoliceMazePS12TargetCount, kPMTIVariableInc, kVariablePoliceMazePS12TargetCounter, kPoliceMazePS12TargetCount, #if BLADERUNNER_ORIGINAL_BUGS #else kPMTITargetSet, kItemPS12Target17, 0, // remove target-able here + kPMTIEnemyReset, kItemPS12Target17, #endif // BLADERUNNER_ORIGINAL_BUGS kPMTIObstacleReset, kItemPS12Target17, kPMTIFacing, 540, @@ -658,7 +661,7 @@ static const int *getPoliceMazePS12TrackData45() { // Enemy (kItemPS12Target17) kPMTITargetSet, kItemPS12Target17, 1, kPMTIMove, 9, kPMTIWait, 1000, - kPMTIEnemySet, kItemPS12Target17, + kPMTIEnemySet, kItemPS12Target17, // rotate - reveal kPMTIRotate, 284, 80, kPMTIWait, 0, kPMTIRotate, 28, 80, diff --git a/engines/bladerunner/script/scene/ps13.cpp b/engines/bladerunner/script/scene/ps13.cpp index ecd46cf259..4d30339d3e 100644 --- a/engines/bladerunner/script/scene/ps13.cpp +++ b/engines/bladerunner/script/scene/ps13.cpp @@ -63,10 +63,14 @@ void SceneScriptPS13::InitializeScene() { Ambient_Sounds_Add_Sound(308, 5, 100, 17, 27, -100, 100, -101, -101, 0, 0); } -static const int *getPoliceMazePS13TrackData46() { // - Starts activated +static const int *getPoliceMazePS13TrackData46() { // Enemy (kItemPS13Target1) - Starts activated static int trackData[] = { kPMTIActivate, kVariablePoliceMazePS13TargetCounter, kPoliceMazePS13TargetCount, kPMTIVariableInc, kVariablePoliceMazePS13TargetCounter, kPoliceMazePS13TargetCount, +#if BLADERUNNER_ORIGINAL_BUGS +#else + kPMTITargetSet, kItemPS13Target1, 0, // remove target-able here +#endif // BLADERUNNER_ORIGINAL_BUGS kPMTIObstacleReset, kItemPS13Target1, kPMTIFacing, 960, kPMTIPosition, 0, @@ -82,6 +86,10 @@ static const int *getPoliceMazePS13TrackData46() { // - Starts activated kPMTIWait, 500, kPMTIMove, 0, kPMTIObstacleReset, kItemPS13Target1, +#if BLADERUNNER_ORIGINAL_BUGS +#else + kPMTITargetSet, kItemPS13Target1, 0, // remove target-able here +#endif // BLADERUNNER_ORIGINAL_BUGS kPMTIPausedReset1of2, kItemPS13Target14, kItemPS13Target15, kPMTIPausedSet, kItemPS13Target1, kPMTIRestart @@ -89,10 +97,14 @@ static const int *getPoliceMazePS13TrackData46() { // - Starts activated return trackData; } -static const int *getPoliceMazePS13TrackData47() { // - Starts activated +static const int *getPoliceMazePS13TrackData47() { // Enemy (kItemPS13Target2) - Starts activated static int trackData[] = { kPMTIActivate, kVariablePoliceMazePS13TargetCounter, kPoliceMazePS13TargetCount, kPMTIVariableInc, kVariablePoliceMazePS13TargetCounter, kPoliceMazePS13TargetCount, +#if BLADERUNNER_ORIGINAL_BUGS +#else + kPMTITargetSet, kItemPS13Target2, 0, // remove target-able here +#endif // BLADERUNNER_ORIGINAL_BUGS kPMTIObstacleReset, kItemPS13Target2, kPMTIFacing, 823, kPMTIPosition, 0, @@ -106,6 +118,10 @@ static const int *getPoliceMazePS13TrackData47() { // - Starts activated kPMTIShoot, 27, 33, kPMTIMove, 0, kPMTIObstacleReset, kItemPS13Target2, +#if BLADERUNNER_ORIGINAL_BUGS +#else + kPMTITargetSet, kItemPS13Target2, 0, // remove target-able here +#endif // BLADERUNNER_ORIGINAL_BUGS kPMTIPausedReset1of2, kItemPS13Target5, kItemPS13Target7, kPMTIPausedSet, kItemPS13Target2, kPMTIRestart @@ -113,10 +129,14 @@ static const int *getPoliceMazePS13TrackData47() { // - Starts activated return trackData; } -static const int *getPoliceMazePS13TrackData48() { // - Starts activated +static const int *getPoliceMazePS13TrackData48() { // Innocent (kItemPS13Target3) - Starts activated static int trackData[] = { kPMTIActivate, kVariablePoliceMazePS13TargetCounter, kPoliceMazePS13TargetCount, kPMTIVariableInc, kVariablePoliceMazePS13TargetCounter, kPoliceMazePS13TargetCount, +#if BLADERUNNER_ORIGINAL_BUGS +#else + kPMTITargetSet, kItemPS13Target3, 0, // remove target-able here +#endif // BLADERUNNER_ORIGINAL_BUGS kPMTIObstacleReset, kItemPS13Target3, kPMTIFacing, 823, kPMTIPosition, 0, @@ -130,6 +150,10 @@ static const int *getPoliceMazePS13TrackData48() { // - Starts activated kPMTILeave, kPMTIMove, 0, kPMTIObstacleReset, kItemPS13Target3, +#if BLADERUNNER_ORIGINAL_BUGS +#else + kPMTITargetSet, kItemPS13Target3, 0, // remove target-able here +#endif // BLADERUNNER_ORIGINAL_BUGS kPMTIPausedReset1of2, kItemPS13Target8, kItemPS13Target6, kPMTIPausedSet, kItemPS13Target3, kPMTIRestart @@ -137,10 +161,14 @@ static const int *getPoliceMazePS13TrackData48() { // - Starts activated return trackData; } -static const int *getPoliceMazePS13TrackData49() { +static const int *getPoliceMazePS13TrackData49() { // Enemy (kItemPS13Target4) static int trackData[] = { kPMTIActivate, kVariablePoliceMazePS13TargetCounter, kPoliceMazePS13TargetCount, kPMTIVariableInc, kVariablePoliceMazePS13TargetCounter, kPoliceMazePS13TargetCount, +#if BLADERUNNER_ORIGINAL_BUGS +#else + kPMTITargetSet, kItemPS13Target4, 0, // remove target-able here +#endif // BLADERUNNER_ORIGINAL_BUGS kPMTIObstacleReset, kItemPS13Target4, kPMTIFacing, 922, kPMTIPosition, 0, @@ -154,6 +182,10 @@ static const int *getPoliceMazePS13TrackData49() { kPMTIShoot, 27, 33, kPMTIMove, 0, kPMTIObstacleReset, kItemPS13Target4, +#if BLADERUNNER_ORIGINAL_BUGS +#else + kPMTITargetSet, kItemPS13Target4, 0, // remove target-able here +#endif // BLADERUNNER_ORIGINAL_BUGS kPMTIPausedReset1of2, kItemPS13Target9, kItemPS13Target10, kPMTIPausedSet, kItemPS13Target4, kPMTIPosition, 0, @@ -162,10 +194,14 @@ static const int *getPoliceMazePS13TrackData49() { return trackData; } -static const int *getPoliceMazePS13TrackData50() { +static const int *getPoliceMazePS13TrackData50() { // Innocent (kItemPS13Target5) static int trackData[] = { kPMTIActivate, kVariablePoliceMazePS13TargetCounter, kPoliceMazePS13TargetCount, kPMTIVariableInc, kVariablePoliceMazePS13TargetCounter, kPoliceMazePS13TargetCount, +#if BLADERUNNER_ORIGINAL_BUGS +#else + kPMTITargetSet, kItemPS13Target5, 0, // remove target-able here +#endif // BLADERUNNER_ORIGINAL_BUGS kPMTIObstacleReset, kItemPS13Target5, kPMTIFacing, 823, kPMTIPosition, 0, @@ -179,6 +215,10 @@ static const int *getPoliceMazePS13TrackData50() { kPMTIMove, 0, kPMTILeave, kPMTIObstacleReset, kItemPS13Target5, +#if BLADERUNNER_ORIGINAL_BUGS +#else + kPMTITargetSet, kItemPS13Target5, 0, // remove target-able here +#endif // BLADERUNNER_ORIGINAL_BUGS kPMTIPausedReset1of2, kItemPS13Target2, kItemPS13Target7, kPMTIPausedSet, kItemPS13Target5, kPMTIRestart @@ -186,10 +226,14 @@ static const int *getPoliceMazePS13TrackData50() { return trackData; } -static const int *getPoliceMazePS13TrackData51() { +static const int *getPoliceMazePS13TrackData51() { // Enemy (kItemPS13Target6) static int trackData[] = { kPMTIActivate, kVariablePoliceMazePS13TargetCounter, kPoliceMazePS13TargetCount, kPMTIVariableInc, kVariablePoliceMazePS13TargetCounter, kPoliceMazePS13TargetCount, +#if BLADERUNNER_ORIGINAL_BUGS +#else + kPMTITargetSet, kItemPS13Target6, 0, // remove target-able here +#endif // BLADERUNNER_ORIGINAL_BUGS kPMTIObstacleReset, kItemPS13Target6, kPMTIFacing, 823, kPMTIPosition, 0, @@ -204,6 +248,10 @@ static const int *getPoliceMazePS13TrackData51() { kPMTIWait, 500, kPMTIMove, 0, kPMTIObstacleReset, kItemPS13Target6, +#if BLADERUNNER_ORIGINAL_BUGS +#else + kPMTITargetSet, kItemPS13Target6, 0, // remove target-able here +#endif // BLADERUNNER_ORIGINAL_BUGS kPMTIPausedReset1of2, kItemPS13Target8, kItemPS13Target3, kPMTIPausedSet, kItemPS13Target6, kPMTIRestart @@ -211,10 +259,14 @@ static const int *getPoliceMazePS13TrackData51() { return trackData; } -static const int *getPoliceMazePS13TrackData52() { +static const int *getPoliceMazePS13TrackData52() { // Enemy (kItemPS13Target7) - Rotating reveal static int trackData[] = { kPMTIActivate, kVariablePoliceMazePS13TargetCounter, kPoliceMazePS13TargetCount, kPMTIVariableInc, kVariablePoliceMazePS13TargetCounter, kPoliceMazePS13TargetCount, +#if BLADERUNNER_ORIGINAL_BUGS +#else + kPMTITargetSet, kItemPS13Target7, 0, // remove target-able here +#endif // BLADERUNNER_ORIGINAL_BUGS kPMTIObstacleReset, kItemPS13Target7, kPMTIFacing, 305, kPMTIPosition, 0, @@ -225,7 +277,7 @@ static const int *getPoliceMazePS13TrackData52() { kPMTIEnemyReset, kItemPS13Target7, kPMTIMove, 9, kPMTIWait, 500, - kPMTIEnemySet, kItemPS13Target7, + kPMTIEnemySet, kItemPS13Target7, // rotate - reveal kPMTIRotate, 555, 80, kPMTIWait, 0, kPMTIRotate, 833, 80, @@ -233,6 +285,10 @@ static const int *getPoliceMazePS13TrackData52() { kPMTIShoot, 27, 33, kPMTIMove, 0, kPMTIObstacleReset, kItemPS13Target7, +#if BLADERUNNER_ORIGINAL_BUGS +#else + kPMTITargetSet, kItemPS13Target7, 0, // remove target-able here +#endif // BLADERUNNER_ORIGINAL_BUGS kPMTIPausedReset1of2, kItemPS13Target2, kItemPS13Target5, kPMTIPausedSet, kItemPS13Target7, kPMTIRestart @@ -240,10 +296,14 @@ static const int *getPoliceMazePS13TrackData52() { return trackData; } -static const int *getPoliceMazePS13TrackData53() { +static const int *getPoliceMazePS13TrackData53() { // Enemy (kItemPS13Target8) - Rotating reveal static int trackData[] = { kPMTIActivate, kVariablePoliceMazePS13TargetCounter, kPoliceMazePS13TargetCount, kPMTIVariableInc, kVariablePoliceMazePS13TargetCounter, kPoliceMazePS13TargetCount, +#if BLADERUNNER_ORIGINAL_BUGS +#else + kPMTITargetSet, kItemPS13Target8, 0, // remove target-able here +#endif // BLADERUNNER_ORIGINAL_BUGS kPMTIObstacleReset, kItemPS13Target8, kPMTIFacing, 356, kPMTIPosition, 0, @@ -253,7 +313,7 @@ static const int *getPoliceMazePS13TrackData53() { kPMTITargetSet, kItemPS13Target8, 1, kPMTIEnemyReset, kItemPS13Target8, kPMTIMove, 5, - kPMTIEnemySet, kItemPS13Target8, + kPMTIEnemySet, kItemPS13Target8, // rotate - reveal kPMTIRotate, 868, 200, kPMTIWait, 1000, kPMTIShoot, 27, 33, @@ -261,6 +321,10 @@ static const int *getPoliceMazePS13TrackData53() { kPMTIWait, 1000, kPMTIMove, 0, kPMTIObstacleReset, kItemPS13Target8, +#if BLADERUNNER_ORIGINAL_BUGS +#else + kPMTITargetSet, kItemPS13Target8, 0, // remove target-able here +#endif // BLADERUNNER_ORIGINAL_BUGS kPMTIPausedReset1of2, kItemPS13Target3, kItemPS13Target6, kPMTIPausedSet, kItemPS13Target8, kPMTIRestart @@ -268,10 +332,14 @@ static const int *getPoliceMazePS13TrackData53() { return trackData; } -static const int *getPoliceMazePS13TrackData54() { +static const int *getPoliceMazePS13TrackData54() { // Enemy (kItemPS13Target9) - Rotating reveal static int trackData[] = { kPMTIActivate, kVariablePoliceMazePS13TargetCounter, kPoliceMazePS13TargetCount, kPMTIVariableInc, kVariablePoliceMazePS13TargetCounter, kPoliceMazePS13TargetCount, +#if BLADERUNNER_ORIGINAL_BUGS +#else + kPMTITargetSet, kItemPS13Target9, 0, // remove target-able here +#endif // BLADERUNNER_ORIGINAL_BUGS kPMTIObstacleReset, kItemPS13Target9, kPMTIFacing, 512, kPMTIPosition, 0, @@ -282,12 +350,16 @@ static const int *getPoliceMazePS13TrackData54() { kPMTIEnemyReset, kItemPS13Target9, kPMTIMove, 3, kPMTIWait, 500, - kPMTIEnemySet, kItemPS13Target9, + kPMTIEnemySet, kItemPS13Target9, // rotate - reveal kPMTIRotate, 768, 80, kPMTIWait, 1000, kPMTIShoot, 27, 33, kPMTIMove, 0, kPMTIObstacleReset, kItemPS13Target9, +#if BLADERUNNER_ORIGINAL_BUGS +#else + kPMTITargetSet, kItemPS13Target9, 0, // remove target-able here +#endif // BLADERUNNER_ORIGINAL_BUGS kPMTIPausedReset1of2, kItemPS13Target13, kItemPS13Target10, kPMTIPausedSet, kItemPS13Target9, kPMTIRestart @@ -295,10 +367,16 @@ static const int *getPoliceMazePS13TrackData54() { return trackData; } -static const int *getPoliceMazePS13TrackData55() { +static const int *getPoliceMazePS13TrackData55() { // Enemy (kItemPS13Target10, kItemPS13Target11, kItemPS13Target12) - Rotating reveal static int trackData[] = { kPMTIActivate, kVariablePoliceMazePS13TargetCounter, kPoliceMazePS13TargetCount, kPMTIVariableInc, kVariablePoliceMazePS13TargetCounter, kPoliceMazePS13TargetCount, +#if BLADERUNNER_ORIGINAL_BUGS +#else + kPMTITargetSet, kItemPS13Target10, 0, // remove target-able here - redundant here though + kPMTITargetSet, kItemPS13Target11, 0, // remove target-able here - redundant here though + kPMTITargetSet, kItemPS13Target12, 0, // remove target-able here - redundant here though +#endif // BLADERUNNER_ORIGINAL_BUGS kPMTIObstacleReset, kItemPS13Target10, kPMTIObstacleReset, kItemPS13Target11, kPMTIObstacleReset, kItemPS13Target12, @@ -310,11 +388,20 @@ static const int *getPoliceMazePS13TrackData55() { kPMTIWaitRandom, 1000, 1000, kPMTIPlaySound, 33, 33, kPMTIEnemyReset, kItemPS13Target10, +#if BLADERUNNER_ORIGINAL_BUGS +#else + kPMTIEnemyReset, kItemPS13Target11, // set the others in the series as non-enemies here too + kPMTIEnemyReset, kItemPS13Target12, // set the others in the series as non-enemies here too +#endif // BLADERUNNER_ORIGINAL_BUGS kPMTIObstacleSet, kItemPS13Target10, kPMTIMove, 14, kPMTIWait, 1000, kPMTIPausedReset, kItemPS13Target11, kPMTIObstacleReset, kItemPS13Target10, +#if BLADERUNNER_ORIGINAL_BUGS +#else + kPMTITargetSet, kItemPS13Target10, 0, // remove target-able here - only for kItemPS13Target10 item +#endif // BLADERUNNER_ORIGINAL_BUGS kPMTIObstacleSet, kItemPS13Target11, kPMTIPausedSet, kItemPS13Target10, kPMTIPosition, 0, @@ -323,30 +410,34 @@ static const int *getPoliceMazePS13TrackData55() { return trackData; } -static const int *getPoliceMazePS13TrackData56() { +static const int *getPoliceMazePS13TrackData56() { // Enemy (kItemPS13Target10, kItemPS13Target11, kItemPS13Target12) - Rotating reveal static int trackData[] = { kPMTIFacing, 327, kPMTIPosition, 0, - kPMTIObstacleSet, kItemPS13Target11, - kPMTIEnemyReset, kItemPS13Target11, + kPMTIObstacleSet, kItemPS13Target11, // redundant (original) + kPMTIEnemyReset, kItemPS13Target11, // [redundant after bug fix] target 10-11-12 still is not revealed as enemy kPMTIMove, 14, kPMTIWait, 1000, kPMTIPausedReset, kItemPS13Target12, kPMTIObstacleReset, kItemPS13Target11, kPMTIObstacleSet, kItemPS13Target12, kPMTIPausedSet, kItemPS13Target11, +#if BLADERUNNER_ORIGINAL_BUGS +#else + kPMTITargetSet, kItemPS13Target11, 0, // remove target-able here - only for kItemPS13Target11 item +#endif // BLADERUNNER_ORIGINAL_BUGS kPMTIPosition, 0, kPMTIRestart }; return trackData; } -static const int *getPoliceMazePS13TrackData57() { +static const int *getPoliceMazePS13TrackData57() { // Enemy (kItemPS13Target10, kItemPS13Target11, kItemPS13Target12) - Rotating reveal static int trackData[] = { - kPMTIEnemySet, kItemPS13Target12, + kPMTIEnemySet, kItemPS13Target12, // rotate - reveal kPMTIFacing, 327, kPMTIPosition, 0, - kPMTIObstacleSet, kItemPS13Target12, + kPMTIObstacleSet, kItemPS13Target12, // redundant (original) kPMTIRotate, 516, 80, kPMTIWait, 0, kPMTIRotate, 843, 80, @@ -355,6 +446,10 @@ static const int *getPoliceMazePS13TrackData57() { kPMTIWait, 500, kPMTIMove, 14, kPMTIObstacleReset, kItemPS13Target12, +#if BLADERUNNER_ORIGINAL_BUGS +#else + kPMTITargetSet, kItemPS13Target12, 0, // remove target-able here - only for kItemPS13Target12 item +#endif // BLADERUNNER_ORIGINAL_BUGS kPMTIPausedReset1of2, kItemPS13Target13, kItemPS13Target9, kPMTIPausedSet, kItemPS13Target12, kPMTIPosition, 0, @@ -363,10 +458,14 @@ static const int *getPoliceMazePS13TrackData57() { return trackData; } -static const int *getPoliceMazePS13TrackData58() { // - Starts activated +static const int *getPoliceMazePS13TrackData58() { // Special (kItemPS13Target13) - Starts activated - Innocent x2 static int trackData[] = { kPMTIActivate, kVariablePoliceMazePS13TargetCounter, kPoliceMazePS13TargetCount, kPMTIVariableInc, kVariablePoliceMazePS13TargetCounter, kPoliceMazePS13TargetCount, +#if BLADERUNNER_ORIGINAL_BUGS +#else + kPMTITargetSet, kItemPS13Target13, 0, // remove target-able here +#endif // BLADERUNNER_ORIGINAL_BUGS kPMTIObstacleReset, kItemPS13Target13, kPMTIFacing, 922, kPMTIPosition, 0, @@ -378,15 +477,21 @@ static const int *getPoliceMazePS13TrackData58() { // - Starts activated kPMTIMove, 9, kPMTIWait, 200, kPMTIMove, 0, - kPMTILeave, +#if BLADERUNNER_ORIGINAL_BUGS + kPMTILeave, // TODO MAZE A bug? intended? credit for "first" innocent kPMTITargetSet, kItemPS13Target13, 1, kPMTIEnemyReset, kItemPS13Target13, +#endif // BLADERUNNER_ORIGINAL_BUGS kPMTIWait, 200, kPMTIMove, 9, kPMTIWait, 200, kPMTIMove, 0, - kPMTILeave, + kPMTILeave, // credit for "second" innocent kPMTIObstacleReset, kItemPS13Target13, +#if BLADERUNNER_ORIGINAL_BUGS +#else + kPMTITargetSet, kItemPS13Target13, 0, // remove target-able here +#endif // BLADERUNNER_ORIGINAL_BUGS kPMTIPausedReset, kItemPS13Target4, kPMTIPausedSet, kItemPS13Target13, kPMTIPosition, 0, @@ -395,10 +500,14 @@ static const int *getPoliceMazePS13TrackData58() { // - Starts activated return trackData; } -static const int *getPoliceMazePS13TrackData62() { +static const int *getPoliceMazePS13TrackData62() { // Enemy (kItemPS13Target14) - Rotating reveal static int trackData[] = { kPMTIActivate, kVariablePoliceMazePS13TargetCounter, kPoliceMazePS13TargetCount, kPMTIVariableInc, kVariablePoliceMazePS13TargetCounter, kPoliceMazePS13TargetCount, +#if BLADERUNNER_ORIGINAL_BUGS +#else + kPMTITargetSet, kItemPS13Target14, 0, // remove target-able here +#endif // BLADERUNNER_ORIGINAL_BUGS kPMTIObstacleReset, kItemPS13Target14, kPMTIFacing, 465, kPMTIPosition, 0, @@ -409,7 +518,7 @@ static const int *getPoliceMazePS13TrackData62() { kPMTIEnemyReset, kItemPS13Target14, kPMTIMove, 14, kPMTIWait, 1000, - kPMTIEnemySet, kItemPS13Target14, + kPMTIEnemySet, kItemPS13Target14, // rotate - reveal kPMTIRotate, 650, 80, kPMTIWait, 0, kPMTIRotate, 937, 80, @@ -421,6 +530,10 @@ static const int *getPoliceMazePS13TrackData62() { kPMTIRotate, 465, 80, kPMTIMove, 0, kPMTIObstacleReset, kItemPS13Target14, +#if BLADERUNNER_ORIGINAL_BUGS +#else + kPMTITargetSet, kItemPS13Target14, 0, // remove target-able here +#endif // BLADERUNNER_ORIGINAL_BUGS kPMTIPausedReset1of2, kItemPS13Target1, kItemPS13Target15, kPMTIPausedSet, kItemPS13Target14, kPMTIRestart @@ -428,10 +541,14 @@ static const int *getPoliceMazePS13TrackData62() { return trackData; } -static const int *getPoliceMazePS13TrackData63() { +static const int *getPoliceMazePS13TrackData63() { // Enemy (kItemPS13Target15) - Rotating reveal static int trackData[] = { kPMTIActivate, kVariablePoliceMazePS13TargetCounter, kPoliceMazePS13TargetCount, kPMTIVariableInc, kVariablePoliceMazePS13TargetCounter, kPoliceMazePS13TargetCount, +#if BLADERUNNER_ORIGINAL_BUGS +#else + kPMTITargetSet, kItemPS13Target15, 0, // remove target-able here +#endif // BLADERUNNER_ORIGINAL_BUGS kPMTIObstacleReset, kItemPS13Target15, kPMTIFacing, 465, kPMTIPosition, 0, @@ -454,6 +571,10 @@ static const int *getPoliceMazePS13TrackData63() { kPMTIRotate, 460, 80, kPMTIMove, 0, kPMTIObstacleReset, kItemPS13Target15, +#if BLADERUNNER_ORIGINAL_BUGS +#else + kPMTITargetSet, kItemPS13Target15, 0, // remove target-able here +#endif // BLADERUNNER_ORIGINAL_BUGS kPMTIPausedReset1of2, kItemPS13Target1, kItemPS13Target14, kPMTIPausedSet, kItemPS13Target15, kPMTIRestart -- cgit v1.2.3