soc-2008-mxcurioni: merged changes to revision 23516
[blender.git] / source / gameengine / Ketsji / KX_KetsjiEngine.h
index a36b3f163fda16c972a8ae16630c554ae2570062..373e8bf218c459e5e5a07bd68631e3f5b918bab5 100644 (file)
@@ -190,7 +190,6 @@ private:
        void                                    DoSound(KX_Scene* scene);
 
 public:
-
        KX_KetsjiEngine(class KX_ISystem* system);
        virtual ~KX_KetsjiEngine();
 
@@ -270,6 +269,10 @@ public:
         * Returns current render frame clock time
         */
        double GetClockTime(void) const;
+       /**
+        * Returns current logic frame clock time
+        */
+       double GetFrameTime(void) const;
 
        double GetRealTime(void) const;
        /**
@@ -396,6 +399,13 @@ protected:
        bool                    BeginFrame();
        void                    ClearFrame();
        void                    EndFrame();
+       
+       
+#ifdef WITH_CXX_GUARDEDALLOC
+public:
+       void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_KetsjiEngine"); }
+       void operator delete( void *mem ) { MEM_freeN(mem); }
+#endif
 };
 
 #endif //__KX_KETSJI_ENGINE