sync with upstream

2020-05-11 21:21:09 +03:00
parent 5f5babe7fe d9db03d606
commit 9b23e33c36
98 changed files with 19077 additions and 2212 deletions
--- a/src/control/Garages.h
+++ b/src/control/Garages.h
@@ -87,7 +87,7 @@ public:
 	CVehicle* RestoreCar();
 };

-static_assert(sizeof(CStoredCar) == 0x28, "CStoredCar");
+VALIDATE_SIZE(CStoredCar, 0x28);

 #define SWITCH_GARAGE_DISTANCE_CLOSE 40.0f