1 files changed, 12 insertions, 2 deletions

diff --git a/src/control/Script.h b/src/control/Script.h
index f7aaa46c..811fbef5 100644
--- a/src/control/Script.h
+++ b/src/control/Script.h
@@ -15,6 +15,12 @@ class CPlayerInfo;
 class CRunningScript;
 
 #define KEY_LENGTH_IN_SCRIPT 8
+#define SPHERE_MARKER_R 252
+#define SPHERE_MARKER_G 138
+#define SPHERE_MARKER_B 242
+#define SPHERE_MARKER_A 228
+#define SPHERE_MARKER_PULSE_PERIOD 2048
+#define SPHERE_MARKER_PULSE_FRACTION 0.1f
 
 struct intro_script_rectangle 
 {
@@ -485,10 +491,11 @@ private:
 
 	float LimitAngleOnCircle(float angle) { return angle < 0.0f ? angle + 360.0f : angle; }
 
-	bool ThisIsAValidRandomPed(uint32 pedtype) {
+	bool ThisIsAValidRandomPed(uint32 pedtype, int civ, int gang, int criminal) {
 		switch (pedtype) {
 		case PEDTYPE_CIVMALE:
 		case PEDTYPE_CIVFEMALE:
+			return civ;
 		case PEDTYPE_GANG1:
 		case PEDTYPE_GANG2:
 		case PEDTYPE_GANG3:
@@ -498,13 +505,16 @@ private:
 		case PEDTYPE_GANG7:
 		case PEDTYPE_GANG8:
 		case PEDTYPE_GANG9:
+			return gang;
 		case PEDTYPE_CRIMINAL:
 		case PEDTYPE_PROSTITUTE:
-			return true;
+			return criminal;
 		default:
 			return false;
 		}
 	}
+
+	bool CheckDamagedWeaponType(int32 type, int32 actual);
 	
 	static bool ThisIsAValidRandomCop(int32 mi, bool cop, bool swat, bool fbi, bool army, bool miami);
 };