2 files changed, 14 insertions, 15 deletions
diff --git a/src/control/Script.h b/src/control/Script.h
index aca148d2..233e00e5 100644
--- a/src/control/Script.h
+++ b/src/control/Script.h
@@ -605,10 +605,9 @@ public:
 
 	float LimitAngleOnCircle(float angle) { return angle < 0.0f ? angle + 360.0f : angle; }
 
+	bool ThisIsAValidRandomCop(uint32 mi, int cop, int swat, int fbi, int army, int miami);
 	bool ThisIsAValidRandomPed(uint32 pedtype, int civ, int gang, int criminal);
 	bool CheckDamagedWeaponType(int32 actual, int32 type);	
-	static bool ThisIsAValidRandomCop(int32 mi, bool cop, bool swat, bool fbi, bool army, bool miami);
-
 	void ReturnFromGosubOrFunction();
 
 };
diff --git a/src/control/Script6.cpp b/src/control/Script6.cpp
index 02427eed..3a03ea9b 100644
--- a/src/control/Script6.cpp
+++ b/src/control/Script6.cpp
@@ -42,6 +42,19 @@
 extern const char* scriptfile;
 #endif
 
+bool CRunningScript::ThisIsAValidRandomCop(uint32 mi, int cop, int swat, int fbi, int army, int miami)
+{
+	switch (mi)
+	{
+	case MI_COP: if (cop) return true; break;
+	case MI_SWAT: if (swat) return true; break;
+	case MI_FBI: if (fbi) return true; break;
+	case MI_ARMY: if (army) return true; break;
+	default: if (mi >= MI_VICE1 && mi <= MI_VICE8 && miami) return true; break;
+	}
+	return false;
+}
+
 bool CRunningScript::ThisIsAValidRandomPed(uint32 pedtype, int civ, int gang, int criminal)
 {
     switch (pedtype) {
@@ -66,19 +79,6 @@ bool CRunningScript::ThisIsAValidRandomPed(uint32 pedtype, int civ, int gang, in
     }
 }
 
-bool CRunningScript::ThisIsAValidRandomCop(int32 mi, bool cop, bool swat, bool fbi, bool army, bool miami)
-{
-	switch (mi)
-	{
-	case MI_COP: if (cop) return true;
-	case MI_SWAT: if (swat) return true;
-	case MI_FBI: if (fbi) return true;
-	case MI_ARMY: if (army) return true;
-	default:
-		return miami && (mi >= MI_VICE1 && mi <= MI_VICE8);
-	}
-}
-
 int8 CRunningScript::ProcessCommands1000To1099(int32 command)
 {
 	switch (command) {