BLADERUNNER: Better formatting for police targets instructions

1 files changed, 330 insertions, 331 deletions

diff --git a/engines/bladerunner/script/scene/ps11.cpp b/engines/bladerunner/script/scene/ps11.cpp
index eac2df1844..5d70167a89 100644
--- a/engines/bladerunner/script/scene/ps11.cpp
+++ b/engines/bladerunner/script/scene/ps11.cpp
@@ -42,25 +42,25 @@ void SceneScriptPS11::InitializeScene() {
 
 static const int *getPoliceMazePS11TrackData9() {
 	static int trackData[] = {
-		kPMTIActivate,			kVariablePoliceMazePS11TargetCounter, kPoliceMazePS11TargetCount,
-		kPMTIVariableInc,		kVariablePoliceMazePS11TargetCounter, kPoliceMazePS11TargetCount,
-		kPMTIObstacleReset,		kItemPS11Target1,
-		kPMTIFacing,			50,
-		kPMTIPosition,			0,
-		kPMTIWaitRandom,		5000, 5000,
-		kPMTIObstacleSet,		kItemPS11Target1,
-		kPMTIPlaySound,			31, 33,
-		kPMTITargetSet,			kItemPS11Target1, 1,
-		kPMTIEnemySet,			kItemPS11Target1,
-		kPMTIMove,				7,
-		kPMTIWait,				1000,
-		kPMTIShoot,				27, 33,
-		kPMTIPlaySound,			34, 33,
-		kPMTIMove,				0,
-		kPMTIWait,				500,
-		kPMTIObstacleReset,		kItemPS11Target1,
-		kPMTIPausedReset1of2,	kItemPS11Target7, kItemPS11Target2,
-		kPMTIPausedSet,			kItemPS11Target1,
+		kPMTIActivate,        kVariablePoliceMazePS11TargetCounter, kPoliceMazePS11TargetCount,
+		kPMTIVariableInc,     kVariablePoliceMazePS11TargetCounter, kPoliceMazePS11TargetCount,
+		kPMTIObstacleReset,   kItemPS11Target1,
+		kPMTIFacing,          50,
+		kPMTIPosition,        0,
+		kPMTIWaitRandom,      5000, 5000,
+		kPMTIObstacleSet,     kItemPS11Target1,
+		kPMTIPlaySound,       31, 33,
+		kPMTITargetSet,       kItemPS11Target1, 1,
+		kPMTIEnemySet,        kItemPS11Target1,
+		kPMTIMove,            7,
+		kPMTIWait,            1000,
+		kPMTIShoot,           27, 33,
+		kPMTIPlaySound,       34, 33,
+		kPMTIMove,            0,
+		kPMTIWait,            500,
+		kPMTIObstacleReset,   kItemPS11Target1,
+		kPMTIPausedReset1of2, kItemPS11Target7, kItemPS11Target2,
+		kPMTIPausedSet,       kItemPS11Target1,
 		kPMTIRestart
 	};
 	return trackData;
@@ -68,25 +68,25 @@ static const int *getPoliceMazePS11TrackData9() {
 
 static const int *getPoliceMazePS11TrackData10() {
 	static int trackData[] = {
-		kPMTIActivate,		kVariablePoliceMazePS11TargetCounter, kPoliceMazePS11TargetCount,
-		kPMTIVariableInc,	kVariablePoliceMazePS11TargetCounter, kPoliceMazePS11TargetCount,
-		kPMTIObstacleReset,	kItemPS11Target2,
-		kPMTIObstacleReset,	kItemPS11Target3,
-		kPMTITargetSet,		kItemPS11Target2, 1,
-		kPMTITargetSet,		kItemPS11Target3, 1,
-		kPMTIFacing,		860,
-		kPMTIPosition,		0,
-		kPMTIWaitRandom,	3000, 6000,
-		kPMTIEnemyReset,	kItemPS11Target2,
-		kPMTIObstacleSet,	kItemPS11Target2,
-		kPMTIPlaySound,		33, 33,
-		kPMTIMove,			14,
-		kPMTIWait,			500,
-		kPMTIPausedReset,	kItemPS11Target3,
-		kPMTIObstacleReset,	kItemPS11Target2,
-		kPMTIObstacleSet,	kItemPS11Target3,
-		kPMTIPausedSet,		kItemPS11Target2,
-		kPMTIPosition,		0,
+		kPMTIActivate,      kVariablePoliceMazePS11TargetCounter, kPoliceMazePS11TargetCount,
+		kPMTIVariableInc,   kVariablePoliceMazePS11TargetCounter, kPoliceMazePS11TargetCount,
+		kPMTIObstacleReset, kItemPS11Target2,
+		kPMTIObstacleReset, kItemPS11Target3,
+		kPMTITargetSet,     kItemPS11Target2, 1,
+		kPMTITargetSet,     kItemPS11Target3, 1,
+		kPMTIFacing,        860,
+		kPMTIPosition,      0,
+		kPMTIWaitRandom,    3000, 6000,
+		kPMTIEnemyReset,    kItemPS11Target2,
+		kPMTIObstacleSet,   kItemPS11Target2,
+		kPMTIPlaySound,     33, 33,
+		kPMTIMove,          14,
+		kPMTIWait,          500,
+		kPMTIPausedReset,   kItemPS11Target3,
+		kPMTIObstacleReset, kItemPS11Target2,
+		kPMTIObstacleSet,   kItemPS11Target3,
+		kPMTIPausedSet,     kItemPS11Target2,
+		kPMTIPosition,      0,
 		kPMTIRestart
 	};
 	return trackData;
@@ -94,25 +94,25 @@ static const int *getPoliceMazePS11TrackData10() {
 
 static const int *getPoliceMazePS11TrackData11() {
 	static int trackData[] = {
-		kPMTIFacing,			860,
-		kPMTIPosition,			0,
-		kPMTIEnemyReset,		kItemPS11Target3,
-		kPMTIObstacleSet,		kItemPS11Target3,
-		kPMTIMove,				25,
-		kPMTIWait,				500,
-		kPMTIEnemySet,			kItemPS11Target3,
-		kPMTIPlaySound,			32, 33,
-		kPMTIRotate,			644, 80,
-		kPMTIWait,				0,
-		kPMTIRotate,			388, 80,
-		kPMTIWait,				1000,
-		kPMTIShoot,				12, 33,
-		kPMTIMove,				79,
-		kPMTIObstacleReset,		kItemPS11Target3,
-		kPMTIPausedReset1of2,	kItemPS11Target7, kItemPS10Target9,
-		kPMTIPausedSet,			kItemPS11Target3,
-		kPMTIPosition,			0,
-		kPMTIFacing,			860,
+		kPMTIFacing,          860,
+		kPMTIPosition,        0,
+		kPMTIEnemyReset,      kItemPS11Target3,
+		kPMTIObstacleSet,     kItemPS11Target3,
+		kPMTIMove,            25,
+		kPMTIWait,            500,
+		kPMTIEnemySet,        kItemPS11Target3,
+		kPMTIPlaySound,       32, 33,
+		kPMTIRotate,          644, 80,
+		kPMTIWait,            0,
+		kPMTIRotate,          388, 80,
+		kPMTIWait,            1000,
+		kPMTIShoot,           12, 33,
+		kPMTIMove,            79,
+		kPMTIObstacleReset,   kItemPS11Target3,
+		kPMTIPausedReset1of2, kItemPS11Target7, kItemPS10Target9,
+		kPMTIPausedSet,       kItemPS11Target3,
+		kPMTIPosition,        0,
+		kPMTIFacing,          860,
 		kPMTIRestart
 	};
 	return trackData;
@@ -120,31 +120,31 @@ static const int *getPoliceMazePS11TrackData11() {
 
 static const int *getPoliceMazePS11TrackData12() {
 	static int trackData[] = {
-		kPMTIActivate,		kVariablePoliceMazePS11TargetCounter, kPoliceMazePS11TargetCount,
-		kPMTIVariableInc,	kVariablePoliceMazePS11TargetCounter, kPoliceMazePS11TargetCount,
-		kPMTIObstacleReset,	kItemPS11Target4,
-		kPMTIFacing,		725,
-		kPMTIPosition,		0,
-		kPMTIWait,			2000,
-		kPMTITargetSet,		kItemPS11Target4, 1,
-		kPMTIEnemyReset,	kItemPS11Target4,
-		kPMTIObstacleSet,	kItemPS11Target4,
-		kPMTIMove,			82,
+		kPMTIActivate,      kVariablePoliceMazePS11TargetCounter, kPoliceMazePS11TargetCount,
+		kPMTIVariableInc,   kVariablePoliceMazePS11TargetCounter, kPoliceMazePS11TargetCount,
+		kPMTIObstacleReset, kItemPS11Target4,
+		kPMTIFacing,        725,
+		kPMTIPosition,      0,
+		kPMTIWait,          2000,
+		kPMTITargetSet,     kItemPS11Target4, 1,
+		kPMTIEnemyReset,    kItemPS11Target4,
+		kPMTIObstacleSet,   kItemPS11Target4,
+		kPMTIMove,          82,
 		kPMTILeave,
-		kPMTIWait,			1000,
-		kPMTIRotate,		570, 80,
-		kPMTIWait,			0,
-		kPMTIRotate,		462, 80,
-		kPMTIWait,			0,
-		kPMTIRotate,		213, 80,
-		kPMTIWait,			1000,
-		kPMTIMove,			0,
-		kPMTIRotate,		725, 80,
-		kPMTIMove,			99,
-		kPMTIObstacleReset,	kItemPS11Target4,
-		kPMTIPausedReset,	27,
-		kPMTIPausedSet,		kItemPS11Target4,
-		kPMTIPosition,		0,
+		kPMTIWait,          1000,
+		kPMTIRotate,        570, 80,
+		kPMTIWait,          0,
+		kPMTIRotate,        462, 80,
+		kPMTIWait,          0,
+		kPMTIRotate,        213, 80,
+		kPMTIWait,          1000,
+		kPMTIMove,          0,
+		kPMTIRotate,        725, 80,
+		kPMTIMove,          99,
+		kPMTIObstacleReset, kItemPS11Target4,
+		kPMTIPausedReset,   27,
+		kPMTIPausedSet,     kItemPS11Target4,
+		kPMTIPosition,      0,
 		kPMTIRestart
 	};
 	return trackData;
@@ -152,40 +152,40 @@ static const int *getPoliceMazePS11TrackData12() {
 
 static const int *getPoliceMazePS11TrackData13() {
 	static int trackData[] = {
-		kPMTIActivate,			kVariablePoliceMazePS11TargetCounter, kPoliceMazePS11TargetCount,
-		kPMTIVariableInc,		kVariablePoliceMazePS11TargetCounter, kPoliceMazePS11TargetCount,
-		kPMTIObstacleReset,		kItemPS11Target5,
-		kPMTIFacing,			340,
-		kPMTIPosition,			0,
-		kPMTIWaitRandom,		4000, 8000,
-		kPMTIObstacleSet,		kItemPS11Target5,
-		kPMTIPlaySound,			33, 33,
-		kPMTITargetSet,			kItemPS11Target5, 1,
-		kPMTIEnemySet,			kItemPS11Target5,
-		kPMTIMove,				4,
-		kPMTIWait,				0,
-		kPMTIRotate,			435, 80,
-		kPMTIWait,				0,
-		kPMTIRotate,			530, 80,
-		kPMTIWait,				100,
-		kPMTIRotate,			435, 80,
-		kPMTIWait,				0,
-		kPMTIRotate,			340, 80,
-		kPMTIWait,				0,
-		kPMTIRotate,			260, 80,
-		kPMTIWait,				0,
-		kPMTIRotate,			180, 80,
-		kPMTIWait,				100,
-		kPMTIRotate,			260, 80,
-		kPMTIWait,				0,
-		kPMTIRotate,			340, 80,
-		kPMTIWait,				200,
-		kPMTIShoot,				27, 33,
-		kPMTIPlaySound,			34, 33,
-		kPMTIMove,				0,
-		kPMTIObstacleReset,		kItemPS11Target5,
-		kPMTIPausedReset1of2,	kItemPS11Target6, kItemPS11Target10,
-		kPMTIPausedSet,			kItemPS11Target5,
+		kPMTIActivate,        kVariablePoliceMazePS11TargetCounter, kPoliceMazePS11TargetCount,
+		kPMTIVariableInc,     kVariablePoliceMazePS11TargetCounter, kPoliceMazePS11TargetCount,
+		kPMTIObstacleReset,   kItemPS11Target5,
+		kPMTIFacing,          340,
+		kPMTIPosition,        0,
+		kPMTIWaitRandom,      4000, 8000,
+		kPMTIObstacleSet,     kItemPS11Target5,
+		kPMTIPlaySound,       33, 33,
+		kPMTITargetSet,       kItemPS11Target5, 1,
+		kPMTIEnemySet,        kItemPS11Target5,
+		kPMTIMove,            4,
+		kPMTIWait,            0,
+		kPMTIRotate,          435, 80,
+		kPMTIWait,            0,
+		kPMTIRotate,          530, 80,
+		kPMTIWait,            100,
+		kPMTIRotate,          435, 80,
+		kPMTIWait,            0,
+		kPMTIRotate,          340, 80,
+		kPMTIWait,            0,
+		kPMTIRotate,          260, 80,
+		kPMTIWait,            0,
+		kPMTIRotate,          180, 80,
+		kPMTIWait,            100,
+		kPMTIRotate,          260, 80,
+		kPMTIWait,            0,
+		kPMTIRotate,          340, 80,
+		kPMTIWait,            200,
+		kPMTIShoot,           27, 33,
+		kPMTIPlaySound,       34, 33,
+		kPMTIMove,            0,
+		kPMTIObstacleReset,   kItemPS11Target5,
+		kPMTIPausedReset1of2, kItemPS11Target6, kItemPS11Target10,
+		kPMTIPausedSet,       kItemPS11Target5,
 		kPMTIRestart
 	};
 	return trackData;
@@ -193,29 +193,29 @@ static const int *getPoliceMazePS11TrackData13() {
 
 static const int *getPoliceMazePS11TrackData14() {
 	static int trackData[] = {
-		kPMTIActivate,			kVariablePoliceMazePS11TargetCounter, kPoliceMazePS11TargetCount,
-		kPMTIVariableInc,		kVariablePoliceMazePS11TargetCounter, kPoliceMazePS11TargetCount,
-		kPMTIObstacleReset,		kItemPS11Target6,
-		kPMTITargetSet,			kItemPS11Target6, 1,
-		kPMTIEnemyReset,		kItemPS11Target6,
-		kPMTIFacing,			900,
-		kPMTIPosition,			0,
-		kPMTIWaitRandom,		3000, 6000,
-		kPMTIObstacleSet,		kItemPS11Target6,
-		kPMTIPlaySound,			33, 33,
-		kPMTIMove,				5,
-		kPMTIWait,				500,
-		kPMTIEnemySet,			kItemPS11Target6,
-		kPMTIRotate,			644, 80,
-		kPMTIWait,				0,
-		kPMTIRotate,			388, 80,
-		kPMTIWait,				1000,
-		kPMTIShoot,				27, 33,
-		kPMTIPlaySound,			34, 33,
-		kPMTIMove,				0,
-		kPMTIObstacleReset,		kItemPS11Target6,
-		kPMTIPausedReset1of2,	kItemPS11Target10, kItemPS11Target5,
-		kPMTIPausedSet,			kItemPS11Target6,
+		kPMTIActivate,        kVariablePoliceMazePS11TargetCounter, kPoliceMazePS11TargetCount,
+		kPMTIVariableInc,     kVariablePoliceMazePS11TargetCounter, kPoliceMazePS11TargetCount,
+		kPMTIObstacleReset,   kItemPS11Target6,
+		kPMTITargetSet,       kItemPS11Target6, 1,
+		kPMTIEnemyReset,      kItemPS11Target6,
+		kPMTIFacing,          900,
+		kPMTIPosition,        0,
+		kPMTIWaitRandom,      3000, 6000,
+		kPMTIObstacleSet,     kItemPS11Target6,
+		kPMTIPlaySound,       33, 33,
+		kPMTIMove,            5,
+		kPMTIWait,            500,
+		kPMTIEnemySet,        kItemPS11Target6,
+		kPMTIRotate,          644, 80,
+		kPMTIWait,            0,
+		kPMTIRotate,          388, 80,
+		kPMTIWait,            1000,
+		kPMTIShoot,           27, 33,
+		kPMTIPlaySound,       34, 33,
+		kPMTIMove,            0,
+		kPMTIObstacleReset,   kItemPS11Target6,
+		kPMTIPausedReset1of2, kItemPS11Target10, kItemPS11Target5,
+		kPMTIPausedSet,       kItemPS11Target6,
 		kPMTIRestart
 	};
 	return trackData;
@@ -223,26 +223,26 @@ static const int *getPoliceMazePS11TrackData14() {
 
 static const int *getPoliceMazePS11TrackData15() {
 	static int trackData[] = {
-		kPMTIActivate,		kVariablePoliceMazePS11TargetCounter, kPoliceMazePS11TargetCount,
-		kPMTIVariableInc,	kVariablePoliceMazePS11TargetCounter, kPoliceMazePS11TargetCount,
-		kPMTIObstacleReset,	kItemPS11Target7,
-		kPMTIObstacleReset,	kItemPS11Target8,
-		kPMTITargetSet,		kItemPS11Target7, 1,
-		kPMTITargetSet,		kItemPS11Target8, 1,
-		kPMTIFacing,		860,
-		kPMTIPosition,		0,
-		kPMTIWaitRandom,	3000, 7000,
-		kPMTIObstacleSet,	kItemPS11Target7,
-		kPMTIPlaySound,		29, 33,
-		kPMTIEnemyReset,	kItemPS11Target7,
-		kPMTIMove,			14,
+		kPMTIActivate,      kVariablePoliceMazePS11TargetCounter, kPoliceMazePS11TargetCount,
+		kPMTIVariableInc,   kVariablePoliceMazePS11TargetCounter, kPoliceMazePS11TargetCount,
+		kPMTIObstacleReset, kItemPS11Target7,
+		kPMTIObstacleReset, kItemPS11Target8,
+		kPMTITargetSet,     kItemPS11Target7, 1,
+		kPMTITargetSet,     kItemPS11Target8, 1,
+		kPMTIFacing,        860,
+		kPMTIPosition,      0,
+		kPMTIWaitRandom,    3000, 7000,
+		kPMTIObstacleSet,   kItemPS11Target7,
+		kPMTIPlaySound,     29, 33,
+		kPMTIEnemyReset,    kItemPS11Target7,
+		kPMTIMove,          14,
 		kPMTILeave,
-		kPMTIWait,			1000,
-		kPMTIPausedReset,	kItemPS11Target8,
-		kPMTIObstacleReset,	kItemPS11Target7,
-		kPMTIObstacleSet,	kItemPS11Target8,
-		kPMTIPausedSet,		kItemPS11Target7,
-		kPMTIPosition,		0,
+		kPMTIWait,          1000,
+		kPMTIPausedReset,   kItemPS11Target8,
+		kPMTIObstacleReset, kItemPS11Target7,
+		kPMTIObstacleSet,   kItemPS11Target8,
+		kPMTIPausedSet,     kItemPS11Target7,
+		kPMTIPosition,      0,
 		kPMTIRestart
 	};
 	return trackData;
@@ -250,24 +250,24 @@ static const int *getPoliceMazePS11TrackData15() {
 
 static const int *getPoliceMazePS11TrackData16() {
 	static int trackData[] = {
-		kPMTIFacing,			860,
-		kPMTIPosition,			0,
-		kPMTIObstacleSet,		kItemPS11Target8,
-		kPMTIEnemyReset,		kItemPS11Target8,
-		kPMTIMove,				25,
-		kPMTIWait,				500,
-		kPMTIPlaySound,			32, 33,
-		kPMTIRotate,			644, 100,
-		kPMTIWait,				0,
-		kPMTIRotate,			388, 200,
-		kPMTIWait,				500,
-		kPMTIMove,				79,
+		kPMTIFacing,          860,
+		kPMTIPosition,        0,
+		kPMTIObstacleSet,     kItemPS11Target8,
+		kPMTIEnemyReset,      kItemPS11Target8,
+		kPMTIMove,            25,
+		kPMTIWait,            500,
+		kPMTIPlaySound,       32, 33,
+		kPMTIRotate,          644, 100,
+		kPMTIWait,            0,
+		kPMTIRotate,          388, 200,
+		kPMTIWait,            500,
+		kPMTIMove,            79,
 		kPMTILeave,
-		kPMTIObstacleReset,		kItemPS11Target8,
-		kPMTIPausedReset1of2,	kItemPS11Target2, kItemPS11Target1,
-		kPMTIPausedSet,			kItemPS11Target8,
-		kPMTIPosition,			0,
-		kPMTIFacing,			860,
+		kPMTIObstacleReset,   kItemPS11Target8,
+		kPMTIPausedReset1of2, kItemPS11Target2, kItemPS11Target1,
+		kPMTIPausedSet,       kItemPS11Target8,
+		kPMTIPosition,        0,
+		kPMTIFacing,          860,
 		kPMTIRestart
 	};
 	return trackData;
@@ -275,33 +275,33 @@ static const int *getPoliceMazePS11TrackData16() {
 
 static const int *getPoliceMazePS11TrackData17() {
 	static int trackData[] = {
-		kPMTIActivate,			kVariablePoliceMazePS11TargetCounter, kPoliceMazePS11TargetCount,
-		kPMTIVariableInc,		kVariablePoliceMazePS11TargetCounter, kPoliceMazePS11TargetCount,
-		kPMTIFacing,			310,
-		kPMTIPosition,			0,
-		kPMTIObstacleSet,		kItemPS11Target9,
-		kPMTITargetSet,			kItemPS11Target9, 1,
-		kPMTIEnemySet,			kItemPS11Target9,
-		kPMTIWaitRandom,		4000, 8000,
-		kPMTIPlaySound,			32, 33,
-		kPMTIMove,				10,
-		kPMTIWait,				0,
-		kPMTIShoot,				27, 33,
-		kPMTIMove,				0,
-		kPMTITargetSet,			kItemPS11Target9, 1,
-		kPMTIEnemySet,			kItemPS11Target9,
-		kPMTIMove,				24,
-		kPMTITargetSet,			kItemPS11Target9, 1,
-		kPMTIEnemySet,			kItemPS11Target9,
-		kPMTIMove,				10,
-		kPMTIWait,				0,
-		kPMTIShoot,				27, 33,
-		kPMTIMove,				24,
-		kPMTIWait,				1000,
-		kPMTIObstacleReset,		kItemPS11Target9,
-		kPMTIPausedReset1of2,	kItemPS11Target15, kItemPS11Target14,
-		kPMTIPausedSet, 		kItemPS11Target9,
-		kPMTIPosition,			0,
+		kPMTIActivate,        kVariablePoliceMazePS11TargetCounter, kPoliceMazePS11TargetCount,
+		kPMTIVariableInc,     kVariablePoliceMazePS11TargetCounter, kPoliceMazePS11TargetCount,
+		kPMTIFacing,          310,
+		kPMTIPosition,        0,
+		kPMTIObstacleSet,     kItemPS11Target9,
+		kPMTITargetSet,       kItemPS11Target9, 1,
+		kPMTIEnemySet,        kItemPS11Target9,
+		kPMTIWaitRandom,      4000, 8000,
+		kPMTIPlaySound,       32, 33,
+		kPMTIMove,            10,
+		kPMTIWait,            0,
+		kPMTIShoot,           27, 33,
+		kPMTIMove,            0,
+		kPMTITargetSet,       kItemPS11Target9, 1,
+		kPMTIEnemySet,        kItemPS11Target9,
+		kPMTIMove,            24,
+		kPMTITargetSet,       kItemPS11Target9, 1,
+		kPMTIEnemySet,        kItemPS11Target9,
+		kPMTIMove,            10,
+		kPMTIWait,            0,
+		kPMTIShoot,           27, 33,
+		kPMTIMove,            24,
+		kPMTIWait,            1000,
+		kPMTIObstacleReset,   kItemPS11Target9,
+		kPMTIPausedReset1of2, kItemPS11Target15, kItemPS11Target14,
+		kPMTIPausedSet,       kItemPS11Target9,
+		kPMTIPosition,        0,
 		kPMTIRestart
 	};
 	return trackData;
@@ -309,33 +309,33 @@ static const int *getPoliceMazePS11TrackData17() {
 
 static const int *getPoliceMazePS11TrackData18() {
 	static int trackData[] = {
-		kPMTIActivate,		kVariablePoliceMazePS11TargetCounter, kPoliceMazePS11TargetCount,
-		kPMTIVariableInc,	kVariablePoliceMazePS11TargetCounter, kPoliceMazePS11TargetCount,
-		kPMTIObstacleReset,	kItemPS11Target10,
-		kPMTIObstacleReset,	kItemPS11Target11,
-		kPMTIFacing,		900,
-		kPMTIPosition,		0,
-		kPMTITargetSet,		kItemPS11Target10, 1,
-		kPMTITargetSet,		kItemPS11Target11, 1,
-		kPMTIEnemyReset,	kItemPS11Target10,
-		kPMTIWaitRandom,	4000, 6000,
-		kPMTIObstacleSet,	kItemPS11Target10,
-		kPMTIMove,			5,
-		kPMTIPlaySound,		kItemPS11Target11, 33,
-		kPMTIPlaySound,		3, 33,
-		kPMTIWait,			1000,
+		kPMTIActivate,      kVariablePoliceMazePS11TargetCounter, kPoliceMazePS11TargetCount,
+		kPMTIVariableInc,   kVariablePoliceMazePS11TargetCounter, kPoliceMazePS11TargetCount,
+		kPMTIObstacleReset, kItemPS11Target10,
+		kPMTIObstacleReset, kItemPS11Target11,
+		kPMTIFacing,        900,
+		kPMTIPosition,      0,
+		kPMTITargetSet,     kItemPS11Target10, 1,
+		kPMTITargetSet,     kItemPS11Target11, 1,
+		kPMTIEnemyReset,    kItemPS11Target10,
+		kPMTIWaitRandom,    4000, 6000,
+		kPMTIObstacleSet,   kItemPS11Target10,
+		kPMTIMove,          5,
+		kPMTIPlaySound,     kItemPS11Target11, 33,
+		kPMTIPlaySound,     3, 33,
+		kPMTIWait,          1000,
 		kPMTILeave,
-		kPMTIRotate,		700, 80,
-		kPMTIEnemySet,		kItemPS11Target10,
-		kPMTIWait,			0,
-		kPMTIRotate,		512, 200,
-		kPMTIWait,			1000,
-		kPMTIShoot,			12, 33,
-		kPMTIPausedReset,	kItemPS11Target11,
-		kPMTIObstacleReset,	kItemPS11Target10,
-		kPMTIObstacleSet,	kItemPS11Target11,
-		kPMTIPausedSet,		kItemPS11Target10,
-		kPMTIPosition,		0,
+		kPMTIRotate,        700, 80,
+		kPMTIEnemySet,      kItemPS11Target10,
+		kPMTIWait,          0,
+		kPMTIRotate,        512, 200,
+		kPMTIWait,          1000,
+		kPMTIShoot,         12, 33,
+		kPMTIPausedReset,   kItemPS11Target11,
+		kPMTIObstacleReset, kItemPS11Target10,
+		kPMTIObstacleSet,   kItemPS11Target11,
+		kPMTIPausedSet,     kItemPS11Target10,
+		kPMTIPosition,      0,
 		kPMTIRestart
 	};
 	return trackData;
@@ -343,23 +343,23 @@ static const int *getPoliceMazePS11TrackData18() {
 
 static const int *getPoliceMazePS11TrackData19() {
 	static int trackData[] = {
-		kPMTIFacing,			512,
-		kPMTIPosition,			0,
-		kPMTIEnemySet,			kItemPS11Target11,
-		kPMTIMove,				8,
-		kPMTIWait,				4000,
-		kPMTITargetSet,			kItemPS11Target11, 1,
-		kPMTIEnemySet,			kItemPS11Target11,
-		kPMTIMove,				2,
-		kPMTIPlaySound,			32, 33,
-		kPMTIWait,				1000,
-		kPMTIShoot,				12, 33,
-		kPMTIMove,				kItemPS11Target11,
-		kPMTIWait,				500,
-		kPMTIObstacleReset,		kItemPS11Target11,
-		kPMTIPausedReset1of2,	kItemPS11Target5, kItemPS11Target6,
-		kPMTIPausedSet,			kItemPS11Target11,
-		kPMTIPosition,			0,
+		kPMTIFacing,          512,
+		kPMTIPosition,        0,
+		kPMTIEnemySet,        kItemPS11Target11,
+		kPMTIMove,            8,
+		kPMTIWait,            4000,
+		kPMTITargetSet,       kItemPS11Target11, 1,
+		kPMTIEnemySet,        kItemPS11Target11,
+		kPMTIMove,            2,
+		kPMTIPlaySound,       32, 33,
+		kPMTIWait,            1000,
+		kPMTIShoot,           12, 33,
+		kPMTIMove,            kItemPS11Target11,
+		kPMTIWait,            500,
+		kPMTIObstacleReset,   kItemPS11Target11,
+		kPMTIPausedReset1of2, kItemPS11Target5, kItemPS11Target6,
+		kPMTIPausedSet,       kItemPS11Target11,
+		kPMTIPosition,        0,
 		kPMTIRestart
 	};
 	return trackData;
@@ -367,24 +367,24 @@ static const int *getPoliceMazePS11TrackData19() {
 
 static const int *getPoliceMazePS11TrackData20() {
 	static int trackData[] = {
-		kPMTIActivate,			kVariablePoliceMazePS11TargetCounter, kPoliceMazePS11TargetCount,
-		kPMTIVariableInc,		kVariablePoliceMazePS11TargetCounter, kPoliceMazePS11TargetCount,
-		kPMTIObstacleReset,		kItemPS11Target12,
-		kPMTIFacing,			280,
-		kPMTIPosition,			0,
-		kPMTIWaitRandom,		5000, 7000,
-		kPMTITargetSet,			kItemPS11Target12, 1,
-		kPMTIEnemySet,			kItemPS11Target12,
-		kPMTIObstacleSet,		kItemPS11Target12,
-		kPMTIMove,				9,
-		kPMTIPlaySound,			32, 33,
-		kPMTIWait,				1000,
-		kPMTIShoot,				27, 33,
-		kPMTIMove,				0,
-		kPMTIObstacleReset,		kItemPS11Target12,
-		kPMTIPausedReset1of2,	kItemPS11Target13, kItemPS11Target4,
-		kPMTIPausedSet,			kItemPS11Target12,
-		kPMTIPosition,			0,
+		kPMTIActivate,        kVariablePoliceMazePS11TargetCounter, kPoliceMazePS11TargetCount,
+		kPMTIVariableInc,     kVariablePoliceMazePS11TargetCounter, kPoliceMazePS11TargetCount,
+		kPMTIObstacleReset,   kItemPS11Target12,
+		kPMTIFacing,          280,
+		kPMTIPosition,        0,
+		kPMTIWaitRandom,      5000, 7000,
+		kPMTITargetSet,       kItemPS11Target12, 1,
+		kPMTIEnemySet,        kItemPS11Target12,
+		kPMTIObstacleSet,     kItemPS11Target12,
+		kPMTIMove,            9,
+		kPMTIPlaySound,       32, 33,
+		kPMTIWait,            1000,
+		kPMTIShoot,           27, 33,
+		kPMTIMove,            0,
+		kPMTIObstacleReset,   kItemPS11Target12,
+		kPMTIPausedReset1of2, kItemPS11Target13, kItemPS11Target4,
+		kPMTIPausedSet,       kItemPS11Target12,
+		kPMTIPosition,        0,
 		kPMTIRestart
 	};
 	return trackData;
@@ -392,23 +392,23 @@ static const int *getPoliceMazePS11TrackData20() {
 
 static const int *getPoliceMazePS11TrackData21() {
 	static int trackData[] = {
-		kPMTIActivate,			kVariablePoliceMazePS11TargetCounter, kPoliceMazePS11TargetCount,
-		kPMTIVariableInc,		kVariablePoliceMazePS11TargetCounter, kPoliceMazePS11TargetCount,
-		kPMTIObstacleReset,		kItemPS11Target13,
-		kPMTIFacing,			280,
-		kPMTIPosition,			0,
-		kPMTIWaitRandom,		5000, 8000,
-		kPMTITargetSet,			kItemPS11Target13, 1,
-		kPMTIEnemyReset,		kItemPS11Target13,
-		kPMTIObstacleSet,		kItemPS11Target13,
-		kPMTIMove,				5,
+		kPMTIActivate,        kVariablePoliceMazePS11TargetCounter, kPoliceMazePS11TargetCount,
+		kPMTIVariableInc,     kVariablePoliceMazePS11TargetCounter, kPoliceMazePS11TargetCount,
+		kPMTIObstacleReset,   kItemPS11Target13,
+		kPMTIFacing,          280,
+		kPMTIPosition,        0,
+		kPMTIWaitRandom,      5000, 8000,
+		kPMTITargetSet,       kItemPS11Target13, 1,
+		kPMTIEnemyReset,      kItemPS11Target13,
+		kPMTIObstacleSet,     kItemPS11Target13,
+		kPMTIMove,            5,
 		kPMTILeave,
-		kPMTIWait,				1000,
-		kPMTIMove,				0,
-		kPMTIObstacleReset,		kItemPS11Target13,
-		kPMTIPausedReset1of2,	kItemPS11Target12, kItemPS11Target4,
-		kPMTIPausedSet,			kItemPS11Target13,
-		kPMTIPosition,			0,
+		kPMTIWait,            1000,
+		kPMTIMove,            0,
+		kPMTIObstacleReset,   kItemPS11Target13,
+		kPMTIPausedReset1of2, kItemPS11Target12, kItemPS11Target4,
+		kPMTIPausedSet,       kItemPS11Target13,
+		kPMTIPosition,        0,
 		kPMTIRestart
 	};
 	return trackData;
@@ -416,24 +416,24 @@ static const int *getPoliceMazePS11TrackData21() {
 
 static const int *getPoliceMazePS11TrackData22() {
 	static int trackData[] = {
-		kPMTIActivate,			kVariablePoliceMazePS11TargetCounter, kPoliceMazePS11TargetCount,
-		kPMTIVariableInc,		kVariablePoliceMazePS11TargetCounter, kPoliceMazePS11TargetCount,
-		kPMTIObstacleReset,		kItemPS11Target14,
-		kPMTIFacing,			255,
-		kPMTIPosition,			0,
-		kPMTITargetSet,			kItemPS11Target14, 1,
-		kPMTIEnemySet,			kItemPS11Target14,
-		kPMTIWaitRandom,		5000, 5000,
-		kPMTIObstacleSet,		kItemPS11Target14,
-		kPMTIMove,				7,
-		kPMTIPlaySound,			32, 33,
-		kPMTIWait,				1000,
-		kPMTIShoot,				12, 33,
-		kPMTIMove,				0,
-		kPMTIObstacleReset,		kItemPS11Target14,
-		kPMTIPausedReset1of2,	23, kItemPS11Target9,
-		kPMTIPausedSet,			kItemPS11Target14,
-		kPMTIPosition,			0,
+		kPMTIActivate,        kVariablePoliceMazePS11TargetCounter, kPoliceMazePS11TargetCount,
+		kPMTIVariableInc,     kVariablePoliceMazePS11TargetCounter, kPoliceMazePS11TargetCount,
+		kPMTIObstacleReset,   kItemPS11Target14,
+		kPMTIFacing,          255,
+		kPMTIPosition,        0,
+		kPMTITargetSet,       kItemPS11Target14, 1,
+		kPMTIEnemySet,        kItemPS11Target14,
+		kPMTIWaitRandom,      5000, 5000,
+		kPMTIObstacleSet,     kItemPS11Target14,
+		kPMTIMove,            7,
+		kPMTIPlaySound,       32, 33,
+		kPMTIWait,            1000,
+		kPMTIShoot,           12, 33,
+		kPMTIMove,            0,
+		kPMTIObstacleReset,   kItemPS11Target14,
+		kPMTIPausedReset1of2, 23, kItemPS11Target9,
+		kPMTIPausedSet,       kItemPS11Target14,
+		kPMTIPosition,        0,
 		kPMTIRestart
 	};
 	return trackData;
@@ -441,24 +441,24 @@ static const int *getPoliceMazePS11TrackData22() {
 
 static const int *getPoliceMazePS11TrackData23() {
 	static int trackData[] = {
-		kPMTIActivate,			kVariablePoliceMazePS11TargetCounter, kPoliceMazePS11TargetCount,
-		kPMTIVariableInc,		kVariablePoliceMazePS11TargetCounter, kPoliceMazePS11TargetCount,
-		kPMTIObstacleReset,		kItemPS11Target15,
-		kPMTIFacing,			310,
-		kPMTIPosition,			0,
-		kPMTIWaitRandom,		3000, 6000,
-		kPMTITargetSet,			kItemPS11Target15, 1,
-		kPMTIEnemyReset,		kItemPS11Target15,
-		kPMTIObstacleSet,		kItemPS11Target15,
-		kPMTIWait,				1000,
-		kPMTIMove,				24,
-		kPMTIWait,				1000,
-		kPMTIMove,				0,
+		kPMTIActivate,        kVariablePoliceMazePS11TargetCounter, kPoliceMazePS11TargetCount,
+		kPMTIVariableInc,     kVariablePoliceMazePS11TargetCounter, kPoliceMazePS11TargetCount,
+		kPMTIObstacleReset,   kItemPS11Target15,
+		kPMTIFacing,          310,
+		kPMTIPosition,        0,
+		kPMTIWaitRandom,      3000, 6000,
+		kPMTITargetSet,       kItemPS11Target15, 1,
+		kPMTIEnemyReset,      kItemPS11Target15,
+		kPMTIObstacleSet,     kItemPS11Target15,
+		kPMTIWait,            1000,
+		kPMTIMove,            24,
+		kPMTIWait,            1000,
+		kPMTIMove,            0,
 		kPMTILeave,
-		kPMTIObstacleReset,		kItemPS11Target15,
-		kPMTIPausedReset1of2,	kItemPS11Target14, kItemPS11Target9,
-		kPMTIPausedSet,			kItemPS11Target15,
-		kPMTIPosition,			0,
+		kPMTIObstacleReset,   kItemPS11Target15,
+		kPMTIPausedReset1of2, kItemPS11Target14, kItemPS11Target9,
+		kPMTIPausedSet,       kItemPS11Target15,
+		kPMTIPosition,        0,
 		kPMTIRestart
 	};
 	return trackData;
@@ -466,29 +466,28 @@ static const int *getPoliceMazePS11TrackData23() {
 
 static const int *getPoliceMazePS11TrackData27() {
 	static int trackData[] = {
-		kPMTIActivate,			kVariablePoliceMazePS11TargetCounter, kPoliceMazePS11TargetCount,
-		kPMTIVariableInc,		kVariablePoliceMazePS11TargetCounter, kPoliceMazePS11TargetCount,
-		kPMTIObstacleReset,		kItemPS11Target16,
-		kPMTIFacing,			346,
-		kPMTIPosition,			0,
-		kPMTIWait,				0,
-		kPMTITargetSet,			kItemPS11Target16, 1,
-		kPMTIEnemySet,			kItemPS11Target16,
-		kPMTIObstacleSet,		kItemPS11Target16,
-		kPMTIMove,				14,
-		kPMTIWait,				1000,
-		kPMTIShoot,				12, 33,
-		kPMTIMove,				0,
-		kPMTIObstacleReset,		kItemPS11Target16,
-		kPMTIPausedReset1of2,	kItemPS11Target13, kItemPS11Target12,
-		kPMTIPausedSet,			kItemPS11Target16,
-		kPMTIPosition,			0,
+		kPMTIActivate,        kVariablePoliceMazePS11TargetCounter, kPoliceMazePS11TargetCount,
+		kPMTIVariableInc,     kVariablePoliceMazePS11TargetCounter, kPoliceMazePS11TargetCount,
+		kPMTIObstacleReset,   kItemPS11Target16,
+		kPMTIFacing,          346,
+		kPMTIPosition,        0,
+		kPMTIWait,            0,
+		kPMTITargetSet,       kItemPS11Target16, 1,
+		kPMTIEnemySet,        kItemPS11Target16,
+		kPMTIObstacleSet,     kItemPS11Target16,
+		kPMTIMove,            14,
+		kPMTIWait,            1000,
+		kPMTIShoot,           12, 33,
+		kPMTIMove,            0,
+		kPMTIObstacleReset,   kItemPS11Target16,
+		kPMTIPausedReset1of2, kItemPS11Target13, kItemPS11Target12,
+		kPMTIPausedSet,       kItemPS11Target16,
+		kPMTIPosition,        0,
 		kPMTIRestart
 	};
 	return trackData;
 }
 
-
 void SceneScriptPS11::SceneLoaded() {
 	Obstacle_Object("PARKMETR01", true);
 	Obstacle_Object("PARKMETR02", true);