Merge branch 'master' into miami

# Conflicts:
#	src/peds/Ped.cpp
This commit is contained in:
Sergeanur 2020-06-04 05:10:50 +03:00
commit 07c6752cf7
4 changed files with 464 additions and 352 deletions

View file

@ -1064,8 +1064,21 @@ public:
#ifndef MASTER
// Mobile things
void DebugDrawPedDestination(CPed *, int, int);
void DebugDrawPedDesiredHeading(CPed *, int, int);
void DebugDrawCollisionRadius(float, float, float, float, int);
void DebugDrawVisionRange(CVector, float);
void DebugDrawVisionSimple(CVector, float);
void DebugDrawLook();
void DebugDrawPedPsyche();
void DebugDrawDebugLines();
static void SwitchDebugDisplay(void);
static int GetDebugDisplay(void);
void DebugDrawLookAtPoints();
void DebugRenderOnePedText(void);
void DebugRenderClosePedText();
#endif
#ifdef COMPATIBLE_SAVES