Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 3225 for code/branches/core4


Ignore:
Timestamp:
Jun 23, 2009, 8:16:29 PM (15 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:
2 edited

Legend:

Unmodified
Added
Removed
  • code/branches/core4/src/core/Super.h

    r3196 r3225  
    206206
    207207    // SUPER-macro: Calls Parent::functionname() where Parent is the direct parent of classname
    208     #define SUPER(classname, functionname, ...) \
    209         SUPER_##functionname(classname, functionname, __VA_ARGS__)
     208    #ifdef ORXONOX_COMPILER_MSVC
     209        #define SUPER(classname, functionname, ...) \
     210            __super::functionname(__VA_ARGS__)
     211    #else
     212        #define SUPER(classname, functionname, ...) \
     213            SUPER_##functionname(classname, functionname, __VA_ARGS__)
     214    #endif
    210215
    211216    // helper macro: for functions without arguments
  • code/branches/core4/src/orxonox/interfaces/Tickable.h

    r3196 r3225  
    5757                @param dt The time since the last frame in seconds
    5858            */
    59             virtual void tick(float dt) = 0;
     59            virtual void tick(float dt) { }
    6060
    6161        protected:
Note: See TracChangeset for help on using the changeset viewer.