Merge branch 'master' into miami

# Conflicts: # src/peds/Ped.cpp # src/peds/Ped.h
2020-06-04 04:32:49 +03:00
parent e1201fc6e2 12717917cc
commit 07d336ddf0
7 changed files with 87 additions and 12 deletions
--- a/src/peds/Ped.h
+++ b/src/peds/Ped.h
@@ -570,7 +570,7 @@ public:
 	CEntity *m_pCollidingEntity;
 	uint8 m_stateUnused;
 	uint32 m_timerUnused;
-	CVector2D *m_wanderRangeBounds;	// array with 2 CVector2D (actually unused CRange2D class) - unused
+	class CRange2D *m_wanderRangeBounds;
 	CWeapon m_weapons[TOTAL_WEAPON_SLOTS];
 	eWeaponType m_storedWeapon;
 	eWeaponType m_delayedWeapon;