Merge of itasc branch. Project files, scons and cmake should be working. Makefile...
[blender.git] / source / gameengine / GameLogic / SCA_EventManager.h
index 5ff5584..f77b115 100644 (file)
@@ -52,10 +52,10 @@ public:
                TIME_EVENTMGR,
                RANDOM_EVENTMGR,
                RAY_EVENTMGR,
-               RADAR_EVENTMGR,
                NETWORK_EVENTMGR,
                JOY_EVENTMGR,
-               ACTUATOR_EVENTMGR
+               ACTUATOR_EVENTMGR,
+               BASIC_EVENTMGR
        };
 
        SCA_EventManager(EVENT_MANAGER_TYPE mgrtype);
@@ -71,6 +71,13 @@ public:
 
 protected:
        EVENT_MANAGER_TYPE              m_mgrtype;
+
+
+#ifdef WITH_CXX_GUARDEDALLOC
+public:
+       void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:SCA_EventManager"); }
+       void operator delete( void *mem ) { MEM_freeN(mem); }
+#endif
 };
 
 #endif