[Orxonox-commit 693] r3225 - in branches/core4/src: core orxonox/interfaces

[rgrieder at orxonox.net]

Author: rgrieder
Date: 2009-06-23 20:16:29 +0200 (Tue, 23 Jun 2009)
New Revision: 3225

Modified:
   branches/core4/src/core/Super.h
   branches/core4/src/orxonox/interfaces/Tickable.h
Log:
Using __super for MSVC because I can't use the orxonox_cast in Super.h

Modified: branches/core4/src/core/Super.h
===================================================================
--- branches/core4/src/core/Super.h	2009-06-23 18:14:46 UTC (rev 3224)
+++ branches/core4/src/core/Super.h	2009-06-23 18:16:29 UTC (rev 3225)
@@ -205,8 +205,13 @@
     */
 
     // SUPER-macro: Calls Parent::functionname() where Parent is the direct parent of classname
-    #define SUPER(classname, functionname, ...) \
-        SUPER_##functionname(classname, functionname, __VA_ARGS__)
+    #ifdef ORXONOX_COMPILER_MSVC
+        #define SUPER(classname, functionname, ...) \
+            __super::functionname(__VA_ARGS__)
+    #else
+        #define SUPER(classname, functionname, ...) \
+            SUPER_##functionname(classname, functionname, __VA_ARGS__)
+    #endif
 
     // helper macro: for functions without arguments
     #define SUPER_NOARGS(classname, functionname) \

Modified: branches/core4/src/orxonox/interfaces/Tickable.h
===================================================================
--- branches/core4/src/orxonox/interfaces/Tickable.h	2009-06-23 18:14:46 UTC (rev 3224)
+++ branches/core4/src/orxonox/interfaces/Tickable.h	2009-06-23 18:16:29 UTC (rev 3225)
@@ -56,7 +56,7 @@
                 @brief Gets called every frame.
                 @param dt The time since the last frame in seconds
             */
-            virtual void tick(float dt) = 0;
+            virtual void tick(float dt) { }
 
         protected:
             Tickable();