Fix for recent BGE commits, when building with c++ guardedalloc.

This commit is contained in:
Bastien Montagne 2013-11-04 22:22:54 +00:00
parent ee854a04fa
commit 93de84f267
2 changed files with 10 additions and 3 deletions

@ -441,6 +441,11 @@ public:
btVector3 vec = getWalkDirection();
return MT_Vector3(vec[0], vec[1], vec[2]);
}
#ifdef WITH_CXX_GUARDEDALLOC
using PHY_ICharacter::operator new;
using PHY_ICharacter::operator delete;
#endif
};
///CcdPhysicsController is a physics object that supports continuous collision detection and time of impact based physics resolution.

@ -28,6 +28,10 @@
#ifndef __KX_STORAGE
#define __KX_STORAGE
#ifdef WITH_CXX_GUARDEDALLOC
#include "MEM_guardedalloc.h"
#endif
class RAS_MeshSlot;
class RAS_IStorage
@ -46,9 +50,7 @@ public:
#ifdef WITH_CXX_GUARDEDALLOC
public:
void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:RAS_IStorage"); }
void operator delete( void *mem ) { MEM_freeN(mem); }
MEM_CXX_CLASS_ALLOC_FUNCS("GE:RAS_IStorage")
#endif
};