Merge branch 'master' into garages_dev

2020-04-06 02:01:45 +03:00
parent 7f8a78e5de 27f95d905c
commit 7dc6815903
19 changed files with 3545 additions and 448 deletions
--- a/src/control/Garages.h
+++ b/src/control/Garages.h
@@ -5,6 +5,7 @@
 #include "config.h"

 class CVehicle;
+class CCamera;

 enum eGarageState : int8
 {
@@ -168,6 +169,7 @@ class CGarage

 	friend class CGarages;
 	friend class cAudioManager;
+	friend class CCamera;
 };

 static_assert(sizeof(CGarage) == 140, "CGarage");