sync with upstream

2020-05-17 21:48:12 +03:00
parent a5b84eb9fe 8a7210cad1
commit 3cc20d7962
42 changed files with 7909 additions and 10148 deletions
--- a/src/core/PlayerInfo.h
+++ b/src/core/PlayerInfo.h
@@ -57,6 +57,7 @@ public:
 	uint8 m_nMaxArmour;
 	bool m_bGetOutOfJailFree;
 	bool m_bGetOutOfHospitalFree;
+	bool m_bDriveByAllowed;
 	char m_aSkinName[32];
 	RwTexture *m_pSkinTexture;