Changeset 1406 for code/branches/network/src/orxonox/Orxonox.cc

Timestamp:

May 24, 2008, 1:39:05 PM (16 years ago)

Author:

rgrieder

Message:

• merged Felix's changes from trunk to network branch
• added "svn:eol-style native" property to keybindings.ini

File:

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

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

@@ -181 +181 @@
   {
     // keep in mind: the order of deletion is very important!
-    if (this->orxonoxHUD_)
-      delete this->orxonoxHUD_;
+//    if (this->orxonoxHUD_)
+//      delete this->orxonoxHUD_;
     Loader::close();
     InputManager::destroy();
@@ -350 +350 @@
     // Load the HUD
     COUT(3) << "Orxonox: Loading HUD..." << std::endl;
-    orxonoxHUD_ = new HUD(1);
+    orxonoxHUD_ = &HUD::getSingleton();
 
     COUT(3) << "Orxonox: Loading Console..." << std::endl;
@@ -490 +490 @@
 //      orxonoxHUD_->setRocket2(ogreRoot.getCurrentFrameNumber());
       if (eventTimes[3].back() - eventTimes[3].front() != 0)
-//        orxonoxHUD_->setRocket1((int)(50000.0f/(eventTimes[3].back() - eventTimes[3].front())));
+        HUD::setFPS(50000.0f/(eventTimes[3].back() - eventTimes[3].front()));
 
       // Iterate through all Tickables and call their tick(dt) function