sync with upstream

2020-05-07 23:22:15 +03:00
parent 2dc818e4d2 c715569d1d
commit b99346e6ca
17 changed files with 167 additions and 243 deletions
--- a/src/control/CarCtrl.h
+++ b/src/control/CarCtrl.h
@@ -12,7 +12,7 @@ class CZoneInfo;

 enum{
 	MAX_CARS_TO_KEEP = 2,
-	MAX_CAR_MODELS_IN_ARRAY = 256,
+	MAX_CAR_MODELS_IN_ARRAY = 25,
 };

 #define LANE_WIDTH 5.0f
@@ -34,8 +34,10 @@ public:
 		TAXI,
 		MOPED,
 		MOTORBIKE,
+
 		LEISUREBOAT,
 		WORKERBOAT,
+
 		COPS,
 		MAFIA,
 		TRIAD,