Changeset 1145 for code/branches/console/src/orxonox/Orxonox.h

Timestamp:

Apr 23, 2008, 9:42:12 AM (17 years ago)

Author:

rgrieder

Message:

• changes made in Orxonox.cc and Orxonox.h were overwritten by older files. reverted those.

File:

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

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

@@ -61 +61 @@
       void init(int argc, char **argv, std::string path);
       void start();
-      // not sure if this should be private
-      void abortImmediate(/* some error code */);
+      void abortImmediateForce();
       void abortRequest();
       inline audio::AudioManager* getAudioManagerPointer() { return auMan_; };
@@ -106 +105 @@
       // TODO: make this a config-value by creating a config class for orxonox
       float                 frameSmoothingTime_;
+      InGameConsole*        orxonoxConsole_;
       HUD*                  orxonoxHUD_;
-      InGameConsole*        orxonoxConsole_;
       bool                  bAbort_;        //!< aborts the render loop if true
       float                 timefactor_;    //!< A factor to change the gamespeed