Changeset 6277

Timestamp:

Dec 9, 2009, 9:23:28 AM (15 years ago)

Author:

rgrieder

Message:

Small changes, optimisations and typos.

Location:

code/branches/presentation2/src

Files:

• libraries/core/Game.cc (modified) (3 diffs)
• libraries/core/OrxonoxClass.cc (modified) (1 diff)
• libraries/util/OutputHandler.cc (modified) (1 diff)
• modules/weapons/projectiles/Projectile.cc (modified) (1 diff)

code/branches/presentation2/src/libraries/core/Game.cc

@@ -178 +178 @@
             this->updateGameStateStack();
 
-            // Core preUpdate (doesn't throw)
+            // Core preUpdate
             try
                 { this->core_->preUpdate(*this->gameClock_); }
@@ -192 +192 @@
             this->updateGameStates();
 
-            // Core postUpdate (doesn't throw)
+            // Core postUpdate
             try
                 { this->core_->postUpdate(*this->gameClock_); }
@@ -206 +206 @@
             this->updateStatistics();
 
-            // Limit framerate
+            // Limit frame rate
             this->updateFPSLimiter();
         }

code/branches/presentation2/src/libraries/core/OrxonoxClass.cc

@@ -49 +49 @@
         this->referenceCount_ = 0;
         this->requestedDestruction_ = false;
+        // Optimisation
+        this->objectPointers_.reserve(6);
     }
 

code/branches/presentation2/src/libraries/util/OutputHandler.cc

@@ -39 +39 @@
 #include <cstdlib>
 #include <fstream>
+#include <iostream>
 #include <sstream>
 

code/branches/presentation2/src/modules/weapons/projectiles/Projectile.cc

@@ -53 +53 @@
         if (GameMode::isMaster())
         {
+            this->setMass(1.0);
             this->enableCollisionCallback();
             this->setCollisionResponse(false);