Merge branch 'miami' into lcs

# Conflicts: # src/control/Script.h
2021-01-16 16:56:24 +02:00
parent 405a75f26b 21a6ed247b
commit eb5fdac918
4 changed files with 599 additions and 517 deletions
--- 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();

 };