Merge remote-tracking branch 'upstream/miami' into miami

2020-05-23 01:43:17 +03:00
parent 7bf561d440 b105403dc7
commit b9115b4429
17 changed files with 551 additions and 294 deletions
--- a/src/peds/Ped.cpp
+++ b/src/peds/Ped.cpp
@@ -59,6 +59,7 @@
 #include "Floater.h"
 #include "Streaming.h"
 #include "PedAttractor.h"
+#include "Debug.h"

 #define CAN_SEE_ENTITY_ANGLE_THRESHOLD	DEGTORAD(60.0f)