Changeset 2846 for code/branches/gui/src/core/Core.h

Timestamp:

Mar 25, 2009, 6:24:15 PM (15 years ago)

Author:

rgrieder

Message:

Moving game clock from Core to Game.
Other small fixes.

File:

• code/branches/gui/src/core/Core.h (modified) (4 diffs)

code/branches/gui/src/core/Core.h

@@ -45 +45 @@
 #include "util/OutputHandler.h"
 
-// Only allow main to access postMainInitialisation, so we need a forward declaration
-int main(int, char**);
 // boost::filesystem header has quite a large tail, use forward declaration
 namespace boost { namespace filesystem
@@ -64 +62 @@
             ~Core();
 
-            Clock* initialise(int argc, char** argv);
+            void initialise(int argc, char** argv);
             void setConfigValues();
 
@@ -75 +73 @@
             static const std::string& getLanguage();
             static void  resetLanguage();
-
-            static const Clock& getGameClock() { return *getInstance().gameClock_; }
 
             static void tsetMediaPath(const std::string& path)
@@ -123 +119 @@
             TclThreadManager*     tclThreadManager_;
 
-            Clock*                gameClock_;
-
             int softDebugLevel_;                            //!< The debug level
             int softDebugLevelConsole_;                     //!< The debug level for the console