Merge branch 'miami' into lcs
* miami: Pool fixes + peds not forming circle fix
This commit is contained in:
@@ -708,10 +708,10 @@ public:
|
||||
float m_radiusToGuard;
|
||||
float m_fMaxHealth;
|
||||
|
||||
static void *operator new(size_t);
|
||||
static void *operator new(size_t, int);
|
||||
static void operator delete(void*, size_t);
|
||||
static void operator delete(void*, int);
|
||||
static void *operator new(size_t) throw();
|
||||
static void *operator new(size_t, int) throw();
|
||||
static void operator delete(void*, size_t) throw();
|
||||
static void operator delete(void*, int) throw();
|
||||
|
||||
CPed(uint32 pedType);
|
||||
~CPed(void);
|
||||
|
||||
Reference in New Issue
Block a user