Changeset 6378 for code/branches/presentation2

Timestamp:

Dec 18, 2009, 12:48:19 PM (15 years ago)

Author:

rgrieder

Message:

Added missing includes (revealed only with PCH and compilations).

Location:

code/branches/presentation2/src

Files:

• libraries/core/Game.cc (modified) (1 diff)
• modules/overlays/hud/HUDNavigation.cc (modified) (1 diff)
• modules/weapons/projectiles/Rocket.cc (modified) (2 diffs)
• modules/weapons/projectiles/Rocket.h (modified) (1 diff)
• orxonox/gamestates/GSMainMenu.cc (modified) (1 diff)
• orxonox/gamestates/GSRoot.cc (modified) (3 diffs)
• orxonox/sound/SoundBuffer.cc (modified) (1 diff)
• orxonox/sound/SoundBuffer.h (modified) (1 diff)
• orxonox/sound/SoundManager.cc (modified) (1 diff)
• orxonox/sound/SoundStreamer.cc (modified) (1 diff)
• orxonox/sound/SoundStreamer.h (modified) (1 diff)

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

@@ -143 +143 @@
             .description("Sets the time in microseconds interval at which average fps, etc. gets calculated.");
         SetConfigValue(fpsLimit_, 50)
-            .description("Sets the desired framerate (0 for no limit).");
+            .description("Sets the desired frame rate (0 for no limit).");
     }
 

code/branches/presentation2/src/modules/overlays/hud/HUDNavigation.cc

@@ -273 +273 @@
     void HUDNavigation::sizeChanged()
     {
-        // use size to compensate for apspect ratio if enabled.
+        // use size to compensate for aspect ratio if enabled.
         float xScale = this->getActualSize().x;
         float yScale = this->getActualSize().y;

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

@@ -29 +29 @@
 #include "Rocket.h"
 
+#include <BulletDynamics/Dynamics/btRigidBody.h>
+
+#include "core/CoreIncludes.h"
 #include "core/XMLPort.h"
-#include "BulletDynamics/Dynamics/btRigidBody.h"
+#include "worldentities/CameraPosition.h"
 #include "worldentities/pawns/Pawn.h"
 #include "graphics/ParticleSpawner.h"
@@ -37 +40 @@
 #include "infos/PlayerInfo.h"
 #include "controllers/Controller.h"
-#include "worldentities/CameraPosition.h"
-
 #include "sound/WorldSound.h"
 

code/branches/presentation2/src/modules/weapons/projectiles/Rocket.h

@@ -31 +31 @@
 
 #include "weapons/WeaponsPrereqs.h"
+
+#include "tools/Timer.h"
 #include "worldentities/ControllableEntity.h"
 

code/branches/presentation2/src/orxonox/gamestates/GSMainMenu.cc

@@ -37 +37 @@
 #include "core/ConsoleCommand.h"
 #include "core/ConfigValueIncludes.h"
+#include "core/CoreIncludes.h"
 #include "core/GraphicsManager.h"
 #include "core/GUIManager.h"

code/branches/presentation2/src/orxonox/gamestates/GSRoot.cc

@@ -30 +30 @@
 
 #include "util/Clock.h"
+#include "core/BaseObject.h"
 #include "core/ConsoleCommand.h"
 #include "core/Game.h"
@@ -58 +59 @@
     {
         unsigned int nr=0;
-        for(ObjectList<BaseObject>::iterator it = ObjectList<BaseObject>::begin(); it; ++it){
-            if( dynamic_cast<Synchronisable*>(*it) )
+        for (ObjectList<BaseObject>::iterator it = ObjectList<BaseObject>::begin(); it; ++it)
+        {
+            if (dynamic_cast<Synchronisable*>(*it))
                 COUT(0) << "object: " << it->getIdentifier()->getName() << " id: " << dynamic_cast<Synchronisable*>(*it)->getObjectID() << std::endl;
             else
@@ -66 +68 @@
         }
         COUT(0) << "currently got " << nr << " objects" << std::endl;
-    
     }
 

code/branches/presentation2/src/orxonox/sound/SoundBuffer.cc

@@ -35 +35 @@
 #include "util/Exception.h"
 #include "util/StringUtils.h"
-#include "core/Resource.h"
 #include "sound/SoundManager.h"
 

code/branches/presentation2/src/orxonox/sound/SoundBuffer.h

@@ -31 +31 @@
 
 #include "OrxonoxPrereqs.h"
+
+#include <list>
 #include <boost/shared_ptr.hpp>
+#include "core/Resource.h"
 
 namespace orxonox

code/branches/presentation2/src/orxonox/sound/SoundManager.cc

@@ -39 +39 @@
 #include "util/Clock.h"
 #include "core/ConfigValueIncludes.h"
+#include "core/CoreIncludes.h"
 #include "core/GameMode.h"
 #include "core/ScopedSingletonManager.h"

code/branches/presentation2/src/orxonox/sound/SoundStreamer.cc

@@ -26 +26 @@
  */
 #include "SoundStreamer.h"
-#include "SoundManager.h"
+
 #include <al.h>
 #include <vorbis/vorbisfile.h>
+#include "SoundManager.h"
 
 namespace orxonox

code/branches/presentation2/src/orxonox/sound/SoundStreamer.h

@@ -33 +33 @@
 #include <string>
 #include <OgreDataStream.h>
+#include "core/CorePrereqs.h"
 
 namespace orxonox