Changeset 1446 for code/branches/network/src/orxonox/Orxonox.h

Timestamp:

May 28, 2008, 5:30:11 AM (17 years ago)

Author:

landauf

Message:

merged console branch into network branch

after several heavy troubles it compiles, but there is still a bug I couldn't fix: orxonox crashes as soon as one presses a key after opening the console… maybe someone else sees the problem?

File:

• code/branches/network/src/orxonox/Orxonox.h (modified) (2 diffs)

code/branches/network/src/orxonox/Orxonox.h

@@ -70 +70 @@
       static inline float getTimeFactor() { return Orxonox::getSingleton()->timefactor_; }
       static inline void exit() { Orxonox::getSingleton()->abortRequest(); }
-      static inline void activateConsole();
 
    private:
@@ -97 +96 @@
       // TODO: make this a config-value by creating a config class for orxonox
       float                 frameSmoothingTime_;
-      InGameConsole*        orxonoxConsole_;
       HUD*                  orxonoxHUD_;
       bool                  bAbort_;        //!< aborts the render loop if true