Changeset 3225 for code/branches/core4

Timestamp:

Jun 23, 2009, 8:16:29 PM (16 years ago)

Author:

rgrieder

Message:

Using super for MSVC because I can't use the orxonox_cast in Super.h

Location:

code/branches/core4/src

Files:

• core/Super.h (modified) (1 diff)
• orxonox/interfaces/Tickable.h (modified) (1 diff)

code/branches/core4/src/core/Super.h

@@ -206 +206 @@
 
     // 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

code/branches/core4/src/orxonox/interfaces/Tickable.h

@@ -57 +57 @@
                 @param dt The time since the last frame in seconds
             */
-            virtual void tick(float dt) = 0;
+            virtual void tick(float dt) { }
 
         protected: