merge master to miami

2021-01-01 14:53:20 +03:00
parent c74c7ce1d4 2f05c64470
commit 9fd93e8e57
18 changed files with 1173 additions and 88 deletions
--- a/src/control/Script6.cpp
+++ b/src/control/Script6.cpp
@ -3,6 +3,7 @@
 #include "Script.h"
 #include "ScriptCommands.h"

+#include "Bike.h"
 #include "CarCtrl.h"
 #include "Cranes.h"
 #include "Credits.h"
@ -31,7 +32,6 @@
 #include "Weather.h"
 #include "Zones.h"
 #include "main.h"
-#include "Bike.h"
 #include "GameLogic.h"
 #include "Sprite.h"
 #include "CarAI.h"