Changeset 1062 for code/trunk/src/orxonox

Timestamp:

Apr 14, 2008, 5:50:25 PM (16 years ago)

Author:

rgrieder

Message:

• changed header file inclusion order

Location:

code/trunk/src/orxonox

Files:

• GraphicsEngine.cc (modified) (2 diffs)
• Orxonox.cc (modified) (1 diff)
• objects/weapon/WeaponStation.h (modified) (1 diff)
• tools/Timer.cc (modified) (1 diff)

code/trunk/src/orxonox/GraphicsEngine.cc

@@ -133 +133 @@
 
     // create a logManager
-    /*LogManager *logger;
-                if(LogManager::getSingletonPtr() == 0)
-                        logger = new LogManager();
-    else
-      logger = LogManager::getSingletonPtr();
+    Ogre::LogManager *logger;
+                if (Ogre::LogManager::getSingletonPtr() == 0)
+                        logger = new Ogre::LogManager();
+    else
+      logger = Ogre::LogManager::getSingletonPtr();
     COUT(4) << "*** GraphicsEngine: Ogre LogManager created/assigned" << std::endl;
 
     // create our own log that we can listen to
-    Log *myLog;
+    Ogre::Log *myLog;
     if (this->ogreLogfile_ == "")
       myLog = logger->createLog("ogre.log", true, false, true);
@@ -148 +148 @@
     COUT(4) << "*** GraphicsEngine: Ogre Log created" << std::endl;
 
-    myLog->setLogDetail(LL_BOREME);
-    myLog->addListener(this);*/
+    myLog->setLogDetail(Ogre::LL_BOREME);
+    myLog->addListener(this);
 
     // Root will detect that we've already created a Log

code/trunk/src/orxonox/Orxonox.cc

@@ -448 +448 @@
       // Iterate through all Tickables and call their tick(dt) function
       for (Iterator<Tickable> it = ObjectList<Tickable>::start(); it; )
-        (it++)->tick((float)evt.timeSinceLastFrame * this->timefactor_);
+      {
+        (it)->tick((float)evt.timeSinceLastFrame * this->timefactor_);
+         it++;
+     }
 
       // don't forget to call _fireFrameStarted in ogre to make sure

code/trunk/src/orxonox/objects/weapon/WeaponStation.h

@@ -31 +31 @@
 #define _WeaponStation_H__
 
+#include "OrxonoxPrereqs.h"
+
 #include <OgrePrerequisites.h>
-
-#include "OrxonoxPrereqs.h"
 
 

code/trunk/src/orxonox/tools/Timer.cc

@@ -28 +28 @@
 
 #include "OrxonoxStableHeaders.h"
+#include "Timer.h"
+
 #include "core/Executor.h"
 #include "core/CoreIncludes.h"
 #include "core/ConsoleCommand.h"
 #include "core/CommandExecutor.h"
-#include "Timer.h"
 
 namespace orxonox