Merge branch 'miami' of github.com:GTAmodding/re3 into miami

2020-05-11 22:21:26 +02:00
parent 6e4710b717 d9db03d606
commit 0eb5f93e96
99 changed files with 19079 additions and 2214 deletions
--- a/src/modelinfo/BaseModelInfo.h
+++ b/src/modelinfo/BaseModelInfo.h
@@ -17,7 +17,7 @@ enum ModelInfoType : uint8
 	MITYPE_XTRACOMPS,	// unused but still in enum
 	MITYPE_HAND	// xbox and mobile
 };
-static_assert(sizeof(ModelInfoType) == 1, "ModeInfoType: error");
+VALIDATE_SIZE(ModelInfoType, 1);

 class C2dEffect;