Changeset 1646 for code/branches/gui/src/orxonox/Orxonox.cc

Timestamp:

Jul 24, 2008, 10:40:22 PM (16 years ago)

Author:

rgrieder

Message:

• privatised InputState c'tors
• added destruction code for GUIManager
• fixed some issues and bugs
• found 2400 memory leaks
• haven't done anything about it
• converted GUIManager to Ogre Singleton
• added NULL checkers in Loader

File:

• code/branches/gui/src/orxonox/Orxonox.cc (modified) (3 diffs)

code/branches/gui/src/orxonox/Orxonox.cc

@@ -115 +115 @@
     , inputManager_(0)
     , radar_(0)
+    , console_(0)
+    , guiManager_(0)
   {
     RegisterRootObject(Orxonox);
@@ -142 +144 @@
     if (this->radar_)
       delete this->radar_;
+
+    if (this->guiManager_)
+      delete guiManager_;
 
     //if (this->auMan_)
@@ -271 +276 @@
 
           // load the CEGUI interface
-          GUIManager::getInstance().initialise();
+          guiManager_ = new GUIManager();
+          guiManager_->initialise();
         }