Changeset 10733 for code/branches

Timestamp:

Oct 31, 2015, 6:11:53 PM (9 years ago)

Author:

landauf

Message:

merged branch cpp11 to cpp11_v2

Location:

code/branches/cpp11_v2

Files:

• . (modified) (1 prop)
• cmake/CompilerConfigGCC.cmake (modified) (1 diff)
• src/external/ois/linux/LinuxJoyStickEvents.cpp (modified) (1 diff)
• src/libraries/core/config/ConfigFile.cc (modified) (2 diffs)
• src/libraries/core/object/ObjectListBase.h (modified) (1 diff)
• src/libraries/tools/BulletDebugDrawer.h (modified) (1 diff)
• src/libraries/tools/OgreBulletUtils.h (modified) (2 diffs)
• src/libraries/util/SmallObjectAllocator.h (modified) (1 diff)
• src/modules/invader/Invader.cc (modified) (1 diff)
• src/modules/invader/Invader.h (modified) (2 diffs)
• src/modules/invader/InvaderEnemy.cc (modified) (1 diff)
• src/modules/invader/InvaderEnemy.h (modified) (1 diff)
• src/modules/invader/InvaderEnemyShooter.cc (modified) (1 diff)
• src/modules/invader/InvaderHUDinfo.cc (modified) (1 diff)
• src/modules/invader/InvaderShip.cc (modified) (2 diffs)
• src/modules/invader/InvaderShip.h (modified) (2 diffs)
• src/modules/invader/InvaderWeapon.h (modified) (1 diff)
• src/modules/invader/InvaderWeaponEnemy.cc (modified) (1 diff)
• src/modules/invader/InvaderWeaponEnemy.h (modified) (1 diff)
• src/modules/jump/Jump.cc (modified) (4 diffs)
• src/modules/jump/Jump.h (modified) (2 diffs)
• src/modules/jump/JumpBoots.cc (modified) (1 diff)
• src/modules/jump/JumpBoots.h (modified) (1 diff)
• src/modules/jump/JumpCenterpoint.cc (modified) (1 diff)
• src/modules/jump/JumpCenterpoint.h (modified) (1 diff)
• src/modules/jump/JumpEnemy.cc (modified) (1 diff)
• src/modules/jump/JumpEnemy.h (modified) (1 diff)
• src/modules/jump/JumpFigure.cc (modified) (1 diff)
• src/modules/jump/JumpItem.cc (modified) (1 diff)
• src/modules/jump/JumpItem.h (modified) (1 diff)
• src/modules/jump/JumpPlatform.cc (modified) (1 diff)
• src/modules/jump/JumpPlatform.h (modified) (1 diff)
• src/modules/jump/JumpPlatformDisappear.cc (modified) (1 diff)
• src/modules/jump/JumpPlatformDisappear.h (modified) (1 diff)
• src/modules/jump/JumpPlatformFake.cc (modified) (1 diff)
• src/modules/jump/JumpPlatformFake.h (modified) (1 diff)
• src/modules/jump/JumpPlatformHMove.cc (modified) (1 diff)
• src/modules/jump/JumpPlatformHMove.h (modified) (1 diff)
• src/modules/jump/JumpPlatformStatic.cc (modified) (1 diff)
• src/modules/jump/JumpPlatformStatic.h (modified) (1 diff)
• src/modules/jump/JumpPlatformTimer.cc (modified) (1 diff)
• src/modules/jump/JumpPlatformTimer.h (modified) (1 diff)
• src/modules/jump/JumpPlatformVMove.cc (modified) (1 diff)
• src/modules/jump/JumpPlatformVMove.h (modified) (1 diff)
• src/modules/jump/JumpProjectile.cc (modified) (1 diff)
• src/modules/jump/JumpPropeller.cc (modified) (1 diff)
• src/modules/jump/JumpPropeller.h (modified) (1 diff)
• src/modules/jump/JumpRocket.cc (modified) (1 diff)
• src/modules/jump/JumpRocket.h (modified) (1 diff)
• src/modules/jump/JumpScore.cc (modified) (2 diffs)
• src/modules/jump/JumpShield.cc (modified) (1 diff)
• src/modules/jump/JumpShield.h (modified) (1 diff)
• src/modules/jump/JumpSpring.cc (modified) (1 diff)
• src/modules/jump/JumpSpring.h (modified) (1 diff)
• src/orxonox/chat/ChatManager.cc (modified) (1 diff)
• src/orxonox/controllers/ArtificialController.cc (modified) (4 diffs)

code/branches/cpp11_v2/cmake/CompilerConfigGCC.cmake

@@ -64 +64 @@
 ADD_COMPILER_FLAGS("-Os"                   MinSizeRel     CACHE)
 
+# Introducing c++11
+# Note: there is also 'std=gnu++11', but that might not be portable to windows
+ADD_COMPILER_FLAGS("-std=c++0x" CACHE)
+
 # CMake doesn't seem to set the PIC flags right on certain 64 bit systems
 IF(NOT MINGW AND ${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64")

code/branches/cpp11_v2/src/external/ois/linux/LinuxJoyStickEvents.cpp

@@ -34 +34 @@
 #include <cassert>      
 #include <linux/input.h>
-
+#include <unistd.h>
 
 #include <sstream>

code/branches/cpp11_v2/src/libraries/core/config/ConfigFile.cc

@@ -35 +35 @@
 
 #include <boost/filesystem.hpp>
+
+#include <iterator>
+#include <algorithm>
 
 #include "util/Convert.h"
@@ -93 +96 @@
                         try
                         {
-                            boost::filesystem::copy_file(defaultFilepath, filepath);
+                            std::ifstream input(defaultFilepath.string().c_str(), std::ifstream::in | std::ifstream::binary);
+                            std::ofstream output(filepath.string().c_str(), std::ofstream::out | std::ofstream::binary);
+                            copy(std::istreambuf_iterator<char>(input), std::istreambuf_iterator<char>(), std::ostream_iterator<char>(output));
                             orxout(internal_info, context::config) << "Copied " << this->filename_ << " from the default config folder." << endl;
                         }

code/branches/cpp11_v2/src/libraries/core/object/ObjectListBase.h

@@ -93 +93 @@
             }
 
+            operator T*()
+            {
+                return object_;
+            }
+
             T* object_;              //!< The object
     };

code/branches/cpp11_v2/src/libraries/tools/BulletDebugDrawer.h

@@ -13 +13 @@
 #include <btBulletCollisionCommon.h>
 #include <OgreFrameListener.h>
+#include <OgreVector3.h>
+#include <OgreColourValue.h>
 
 namespace orxonox

code/branches/cpp11_v2/src/libraries/tools/OgreBulletUtils.h

@@ -10 +10 @@
 
 #include "tools/ToolsPrereqs.h"
+#include <OgreVector3.h>
+#include <OgreQuaternion.h>
+#include <OgreColourValue.h>
+#include <OgreMatrix3.h>
+#include <OgreMatrix4.h>
 
 namespace orxonox
@@ -42 +47 @@
     inline Ogre::Matrix3 matrix3(const btMatrix3x3& matrix)
     {
-        return Matrix3(
+        return Ogre::Matrix3(
                 matrix[0][0], matrix[0][1], matrix[0][2],
                 matrix[1][0], matrix[1][1], matrix[1][2],

code/branches/cpp11_v2/src/libraries/util/SmallObjectAllocator.h

@@ -77 +77 @@
 #include "UtilPrereqs.h"
 #include <vector>
+#include <cstdio>
 
 namespace orxonox

code/branches/cpp11_v2/src/modules/invader/Invader.cc

@@ -129 +129 @@
     }
 
+    void Invader::setCenterpoint(InvaderCenterPoint* center)
+    {
+        this->center_ = center;
+    }
+
     void Invader::costLife()
     {

code/branches/cpp11_v2/src/modules/invader/Invader.h

@@ -39 +39 @@
 
 #include "gametypes/Deathmatch.h"
-
-#include "InvaderCenterPoint.h"
-
 #include "tools/Timer.h"
 
@@ -58 +55 @@
             void spawnEnemy();
 
-            void setCenterpoint(InvaderCenterPoint* center)
-            { this->center_ = center; }
+            void setCenterpoint(InvaderCenterPoint* center);
 
             int getLives(){return this->lives;}

code/branches/cpp11_v2/src/modules/invader/InvaderEnemy.cc

@@ -32 +32 @@
 */
 
-#include "invader/InvaderPrereqs.h"
 #include "InvaderEnemy.h"
+
+#include "core/CoreIncludes.h"
+#include "Invader.h"
 #include "InvaderShip.h"
 

code/branches/cpp11_v2/src/modules/invader/InvaderEnemy.h

@@ -37 +37 @@
 #include "invader/InvaderPrereqs.h"
 
-#include "worldentities/pawns/SpaceShip.h"
+#include "worldentities/pawns/Pawn.h"
 
 namespace orxonox

code/branches/cpp11_v2/src/modules/invader/InvaderEnemyShooter.cc

@@ -32 +32 @@
 */
 
-#include "invader/InvaderPrereqs.h"
 #include "InvaderEnemyShooter.h"
-// #include "worldentities/pawns/SpaceShip.h"
+
+#include "core/CoreIncludes.h"
+#include "core/command/Executor.h"
+#include "Invader.h"
+#include "InvaderShip.h"
 
 namespace orxonox

code/branches/cpp11_v2/src/modules/invader/InvaderHUDinfo.cc

@@ -30 +30 @@
 #include "core/XMLPort.h"
 #include "util/Convert.h"
-// #include "Invader.h"
+#include "Invader.h"
 
 namespace orxonox

code/branches/cpp11_v2/src/modules/invader/InvaderShip.cc

@@ -37 +37 @@
 #include "core/XMLPort.h"
 #include "Invader.h"
+#include "InvaderEnemy.h"
+#include "graphics/Camera.h"
+#include "weapons/projectiles/Projectile.h"
 
 namespace orxonox
@@ -139 +142 @@
         isFireing = bBoost;
     }
+    void InvaderShip::rotateRoll(const Vector2& value)
+    {
+        if (getGame())
+            if (getGame()->bEndGame)
+                getGame()->end();
+    }
     inline bool InvaderShip::collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint)
     {

code/branches/cpp11_v2/src/modules/invader/InvaderShip.h

@@ -37 +37 @@
 #include "invader/InvaderPrereqs.h"
 
+#include "weapons/WeaponsPrereqs.h"
 #include "worldentities/pawns/SpaceShip.h"
-#include "graphics/Camera.h"
-#include "weapons/projectiles/Projectile.h"
 
 namespace orxonox
@@ -61 +60 @@
             virtual void rotatePitch(const Vector2& value){};
             //return to main menu if game has ended.
-            virtual void rotateRoll(const Vector2& value){if (getGame()) if (getGame()->bEndGame) getGame()->end();};
+            virtual void rotateRoll(const Vector2& value);
 
             virtual void updateLevel();

code/branches/cpp11_v2/src/modules/invader/InvaderWeapon.h

@@ -35 +35 @@
 #define _InvaderWeapon_H__
 
+#include "invader/InvaderPrereqs.h"
+
+#include "weapons/WeaponsPrereqs.h"
 #include "weapons/weaponmodes/HsW01.h"
-#include "weapons/WeaponsPrereqs.h"
-
-#include "tools/Timer.h"
 
 namespace orxonox

code/branches/cpp11_v2/src/modules/invader/InvaderWeaponEnemy.cc

@@ -34 +34 @@
 #include "InvaderWeaponEnemy.h"
 
+#include "core/CoreIncludes.h"
+#include "weapons/projectiles/Projectile.h"
+
 namespace orxonox
 {

code/branches/cpp11_v2/src/modules/invader/InvaderWeaponEnemy.h

@@ -35 +35 @@
 #define _InvaderWeaponEnemy_H__
 
-// #include "weapons/weaponmodes/HsW01.h"
-// #include "weapons/WeaponsPrereqs.h"
-#include "invader/InvaderWeapon.h"
+#include "invader/InvaderPrereqs.h"
+
+#include "InvaderWeapon.h"
 #include "tools/Timer.h"
 

code/branches/cpp11_v2/src/modules/jump/Jump.cc

@@ -34 +34 @@
 #include "Jump.h"
 #include "core/CoreIncludes.h"
-#include "core/EventIncludes.h"
-#include "core/command/Executor.h"
-#include "core/config/ConfigValueIncludes.h"
-#include "gamestates/GSLevel.h"
-#include "chat/ChatManager.h"
+
 #include "JumpCenterpoint.h"
 #include "JumpPlatform.h"
@@ -56 +52 @@
 #include "JumpBoots.h"
 #include "JumpShield.h"
+
+#include "gamestates/GSLevel.h"
 #include "infos/PlayerInfo.h"
+#include "graphics/Camera.h"
 
 namespace orxonox
@@ -70 +69 @@
         camera = 0;
         setHUDTemplate("JumpHUD");
-
-        setConfigValues();
     }
 
@@ -1300 +1297 @@
         return figure_->dead_;
     }
+
+    void Jump::setCenterpoint(JumpCenterpoint* center)
+    {
+        center_ = center;
+    }
+
 }

code/branches/cpp11_v2/src/modules/jump/Jump.h

@@ -31 +31 @@
 
 #include "jump/JumpPrereqs.h"
-#include "tools/Timer.h"
-#include "graphics/Camera.h"
 #include "gametypes/Deathmatch.h"
-#include "JumpCenterpoint.h"
-#include <list>
 
 namespace orxonox
@@ -51 +47 @@
             float getFuel() const;
             bool getDead(PlayerInfo* player) const;
-            void setCenterpoint(JumpCenterpoint* center)
-                { center_ = center; }
+            void setCenterpoint(JumpCenterpoint* center);
             PlayerInfo* getPlayer() const;
 

code/branches/cpp11_v2/src/modules/jump/JumpBoots.cc

@@ -35 +35 @@
 
 #include "core/CoreIncludes.h"
-#include "core/GameMode.h"
-#include "graphics/Model.h"
-#include "gametypes/Gametype.h"
-
+#include "core/XMLPort.h"
 #include "JumpFigure.h"
-
-#include "sound/WorldSound.h"
-#include "core/XMLPort.h"
 
 namespace orxonox

code/branches/cpp11_v2/src/modules/jump/JumpBoots.h

@@ -30 +30 @@
 #define _JumpBoots_H__
 
-#include "jump/JumpPrereqs.h"
-#include "util/Math.h"
-#include "worldentities/MovableEntity.h"
-
+#include "JumpPrereqs.h"
+#include "JumpItem.h"
 
 namespace orxonox

code/branches/cpp11_v2/src/modules/jump/JumpCenterpoint.cc

@@ -33 +33 @@
 
 #include "JumpCenterpoint.h"
+
 #include "core/CoreIncludes.h"
 #include "core/XMLPort.h"

code/branches/cpp11_v2/src/modules/jump/JumpCenterpoint.h

@@ -31 +31 @@
 
 #include "jump/JumpPrereqs.h"
-
-#include <string>
-
-#include <util/Math.h>
-
 #include "worldentities/StaticEntity.h"
 

code/branches/cpp11_v2/src/modules/jump/JumpEnemy.cc

@@ -35 +35 @@
 
 #include "core/CoreIncludes.h"
-#include "core/GameMode.h"
-#include "graphics/Model.h"
-#include "gametypes/Gametype.h"
-
+#include "core/XMLPort.h"
 #include "JumpFigure.h"
-
-#include "sound/WorldSound.h"
-#include "core/XMLPort.h"
 
 namespace orxonox

code/branches/cpp11_v2/src/modules/jump/JumpEnemy.h

@@ -37 +37 @@
 
 #include "jump/JumpPrereqs.h"
-
-#include "util/Math.h"
-
 #include "worldentities/MovableEntity.h"
-
 
 namespace orxonox

code/branches/cpp11_v2/src/modules/jump/JumpFigure.cc

@@ -36 +36 @@
 #include "core/CoreIncludes.h"
 #include "core/XMLPort.h"
+#include "graphics/Model.h"
+#include "JumpRocket.h"
+#include "JumpPropeller.h"
+#include "JumpBoots.h"
+#include "JumpShield.h"
 
 namespace orxonox

code/branches/cpp11_v2/src/modules/jump/JumpItem.cc

@@ -35 +35 @@
 
 #include "core/CoreIncludes.h"
-#include "core/GameMode.h"
-#include "graphics/Model.h"
-#include "gametypes/Gametype.h"
-
+#include "core/XMLPort.h"
 #include "JumpFigure.h"
-
-#include "sound/WorldSound.h"
-#include "core/XMLPort.h"
 
 namespace orxonox

code/branches/cpp11_v2/src/modules/jump/JumpItem.h

@@ -37 +37 @@
 
 #include "jump/JumpPrereqs.h"
-
-#include "util/Math.h"
-
 #include "worldentities/MovableEntity.h"
 

code/branches/cpp11_v2/src/modules/jump/JumpPlatform.cc

@@ -36 +36 @@
 #include "core/CoreIncludes.h"
 #include "core/GameMode.h"
-#include "graphics/Model.h"
-#include "gametypes/Gametype.h"
-
+#include "core/XMLPort.h"
+#include "sound/WorldSound.h"
 #include "JumpFigure.h"
-
-#include "sound/WorldSound.h"
-#include "core/XMLPort.h"
 
 namespace orxonox

code/branches/cpp11_v2/src/modules/jump/JumpPlatform.h

@@ -36 +36 @@
 #define _JumpPlatform_H__
 
-#include "jump/JumpPrereqs.h"
-#include "util/Math.h"
+#include "JumpPrereqs.h"
 #include "worldentities/MovableEntity.h"
 

code/branches/cpp11_v2/src/modules/jump/JumpPlatformDisappear.cc

@@ -35 +35 @@
 
 #include "core/CoreIncludes.h"
-#include "core/GameMode.h"
-
-#include "gametypes/Gametype.h"
-
+#include "core/XMLPort.h"
 #include "JumpFigure.h"
-
-#include "sound/WorldSound.h"
-#include "core/XMLPort.h"
 
 namespace orxonox

code/branches/cpp11_v2/src/modules/jump/JumpPlatformDisappear.h

@@ -36 +36 @@
 #define _JumpPlatformDisappear_H__
 
-#include "jump/JumpPrereqs.h"
-#include "util/Math.h"
-#include "worldentities/MovableEntity.h"
+#include "JumpPrereqs.h"
+#include "JumpPlatform.h"
 
 namespace orxonox

code/branches/cpp11_v2/src/modules/jump/JumpPlatformFake.cc

@@ -33 +33 @@
 
 #include "JumpPlatformFake.h"
+
 #include "core/CoreIncludes.h"
-#include "core/GameMode.h"
-#include "gametypes/Gametype.h"
-#include "JumpFigure.h"
-#include "sound/WorldSound.h"
 #include "core/XMLPort.h"
 

code/branches/cpp11_v2/src/modules/jump/JumpPlatformFake.h

@@ -36 +36 @@
 #define _JumpPlatformFake_H__
 
-#include "jump/JumpPrereqs.h"
-
-#include "util/Math.h"
-
-#include "worldentities/MovableEntity.h"
-
+#include "JumpPrereqs.h"
+#include "JumpPlatform.h"
 
 namespace orxonox

code/branches/cpp11_v2/src/modules/jump/JumpPlatformHMove.cc

@@ -33 +33 @@
 
 #include "JumpPlatformHMove.h"
+
 #include "core/CoreIncludes.h"
-#include "core/GameMode.h"
-#include "gametypes/Gametype.h"
+#include "core/XMLPort.h"
 #include "JumpFigure.h"
-#include "sound/WorldSound.h"
-#include "core/XMLPort.h"
 
 namespace orxonox

code/branches/cpp11_v2/src/modules/jump/JumpPlatformHMove.h

@@ -30 +30 @@
 #define _JumpPlatformHMove_H__
 
-#include "jump/JumpPrereqs.h"
-
-#include "util/Math.h"
-
-#include "worldentities/MovableEntity.h"
-
+#include "JumpPrereqs.h"
+#include "JumpPlatform.h"
 
 namespace orxonox

code/branches/cpp11_v2/src/modules/jump/JumpPlatformStatic.cc

@@ -33 +33 @@
 
 #include "JumpPlatformStatic.h"
+
 #include "core/CoreIncludes.h"
-#include "core/GameMode.h"
-#include "gametypes/Gametype.h"
+#include "core/XMLPort.h"
 #include "JumpFigure.h"
-#include "sound/WorldSound.h"
-#include "core/XMLPort.h"
 
 namespace orxonox

code/branches/cpp11_v2/src/modules/jump/JumpPlatformStatic.h

@@ -30 +30 @@
 #define _JumpPlatformStatic_H__
 
-#include "jump/JumpPrereqs.h"
-
-#include "util/Math.h"
-
-#include "worldentities/MovableEntity.h"
-
+#include "JumpPrereqs.h"
+#include "JumpPlatform.h"
 
 namespace orxonox

code/branches/cpp11_v2/src/modules/jump/JumpPlatformTimer.cc

@@ -33 +33 @@
 
 #include "JumpPlatformTimer.h"
+
 #include "core/CoreIncludes.h"
-#include "core/GameMode.h"
-#include "gametypes/Gametype.h"
+#include "core/XMLPort.h"
+#include "graphics/ParticleSpawner.h"
 #include "JumpFigure.h"
-#include "sound/WorldSound.h"
-#include "core/XMLPort.h"
 
 namespace orxonox

code/branches/cpp11_v2/src/modules/jump/JumpPlatformTimer.h

@@ -36 +36 @@
 #define _JumpPlatformTimer_H__
 
-#include "jump/JumpPrereqs.h"
-
-#include "util/Math.h"
-
-#include "worldentities/MovableEntity.h"
-#include "graphics/ParticleSpawner.h"
-
+#include "JumpPrereqs.h"
+#include "JumpPlatform.h"
 
 namespace orxonox

code/branches/cpp11_v2/src/modules/jump/JumpPlatformVMove.cc

@@ -33 +33 @@
 
 #include "JumpPlatformVMove.h"
+
 #include "core/CoreIncludes.h"
-#include "core/GameMode.h"
-#include "gametypes/Gametype.h"
+#include "core/XMLPort.h"
 #include "JumpFigure.h"
-#include "sound/WorldSound.h"
-#include "core/XMLPort.h"
 
 namespace orxonox

code/branches/cpp11_v2/src/modules/jump/JumpPlatformVMove.h

@@ -30 +30 @@
 #define _JumpPlatformVMove_H__
 
-#include "jump/JumpPrereqs.h"
-#include "util/Math.h"
-#include "worldentities/MovableEntity.h"
+#include "JumpPrereqs.h"
+#include "JumpPlatform.h"
 
 namespace orxonox

code/branches/cpp11_v2/src/modules/jump/JumpProjectile.cc

@@ -33 +33 @@
 
 #include "JumpProjectile.h"
+
 #include "core/CoreIncludes.h"
-#include "core/GameMode.h"
-#include "graphics/Model.h"
-#include "gametypes/Gametype.h"
+#include "core/XMLPort.h"
 #include "JumpFigure.h"
-#include "sound/WorldSound.h"
-#include "core/XMLPort.h"
+#include "JumpEnemy.h"
 
 namespace orxonox

code/branches/cpp11_v2/src/modules/jump/JumpPropeller.cc

@@ -35 +35 @@
 
 #include "core/CoreIncludes.h"
-#include "core/GameMode.h"
-#include "graphics/Model.h"
-#include "gametypes/Gametype.h"
-
+#include "core/XMLPort.h"
 #include "JumpFigure.h"
-
-#include "sound/WorldSound.h"
-#include "core/XMLPort.h"
 
 namespace orxonox

code/branches/cpp11_v2/src/modules/jump/JumpPropeller.h

@@ -30 +30 @@
 #define _JumpPropeller_H__
 
-#include "jump/JumpPrereqs.h"
-
-#include "util/Math.h"
-
-#include "worldentities/MovableEntity.h"
-
+#include "JumpPrereqs.h"
+#include "JumpItem.h"
 
 namespace orxonox

code/branches/cpp11_v2/src/modules/jump/JumpRocket.cc

@@ -33 +33 @@
 
 #include "JumpRocket.h"
+
 #include "core/CoreIncludes.h"
-#include "core/GameMode.h"
-#include "graphics/Model.h"
-#include "gametypes/Gametype.h"
+#include "core/XMLPort.h"
 #include "JumpFigure.h"
-#include "sound/WorldSound.h"
-#include "core/XMLPort.h"
 
 namespace orxonox

code/branches/cpp11_v2/src/modules/jump/JumpRocket.h

@@ -30 +30 @@
 #define _JumpRocket_H__
 
-#include "jump/JumpPrereqs.h"
-#include "util/Math.h"
-#include "worldentities/MovableEntity.h"
+#include "JumpPrereqs.h"
+#include "JumpItem.h"
 
 namespace orxonox

code/branches/cpp11_v2/src/modules/jump/JumpScore.cc

@@ -33 +33 @@
 
 #include "JumpScore.h"
+
 #include "core/CoreIncludes.h"
 #include "core/XMLPort.h"
@@ -38 +39 @@
 #include "infos/PlayerInfo.h"
 #include "Jump.h"
-#include "sound/WorldSound.h"
 
 namespace orxonox

code/branches/cpp11_v2/src/modules/jump/JumpShield.cc

@@ -35 +35 @@
 
 #include "core/CoreIncludes.h"
-#include "core/GameMode.h"
-#include "graphics/Model.h"
-#include "gametypes/Gametype.h"
-
+#include "core/XMLPort.h"
 #include "JumpFigure.h"
-
-#include "sound/WorldSound.h"
-#include "core/XMLPort.h"
 
 namespace orxonox

code/branches/cpp11_v2/src/modules/jump/JumpShield.h

@@ -30 +30 @@
 #define _JumpShield_H__
 
-#include "jump/JumpPrereqs.h"
-
-#include "util/Math.h"
-
-#include "worldentities/MovableEntity.h"
-
+#include "JumpPrereqs.h"
+#include "JumpItem.h"
 
 namespace orxonox

code/branches/cpp11_v2/src/modules/jump/JumpSpring.cc

@@ -33 +33 @@
 
 #include "JumpSpring.h"
+
 #include "core/CoreIncludes.h"
-#include "core/GameMode.h"
-#include "graphics/Model.h"
-#include "gametypes/Gametype.h"
+#include "core/XMLPort.h"
 #include "JumpFigure.h"
-#include "sound/WorldSound.h"
-#include "core/XMLPort.h"
 
 namespace orxonox

code/branches/cpp11_v2/src/modules/jump/JumpSpring.h

@@ -30 +30 @@
 #define _JumpSpring_H__
 
-#include "jump/JumpPrereqs.h"
-
-#include "util/Math.h"
-
-#include "worldentities/MovableEntity.h"
-
+#include "JumpPrereqs.h"
+#include "JumpItem.h"
 
 namespace orxonox

code/branches/cpp11_v2/src/orxonox/chat/ChatManager.cc

@@ -107 +107 @@
 
         // notify all listeners
-        for (ObjectList<ChatListener>::iterator it = ObjectList<ChatListener>::begin(); it != ObjectList<ChatListener>::end(); ++it)
-            it->incomingChat(text, name);
+        for (ChatListener* listener : ObjectList<ChatListener>())
+            listener->incomingChat(text, name);
     }
 

code/branches/cpp11_v2/src/orxonox/controllers/ArtificialController.cc

@@ -207 +207 @@
     void ArtificialController::setAllBotLevel(float level)
     {
-        for (ObjectList<ArtificialController>::iterator it = ObjectList<ArtificialController>::begin(); it != ObjectList<ArtificialController>::end(); ++it)
-            it->setBotLevel(level);
+        for (ArtificialController* controller : ObjectList<ArtificialController>())
+            controller->setBotLevel(level);
     }
 
@@ -231 +231 @@
     int ArtificialController::getFiremode(std::string name)
     {
-        for (std::map< std::string, int >::iterator it = this->weaponModes_.begin(); it != this->weaponModes_.end(); ++it)
-        {
-            if (it->first == name)
-                return it->second;
+        for (auto firemode : this->weaponModes_)
+        {
+            if (firemode.first == name)
+                return firemode.second;
         }
         return -1;
@@ -259 +259 @@
     {
         WorldEntity* waypoint = NULL;
-        for (ObjectList<WorldEntity>::iterator it = ObjectList<WorldEntity>::begin(); it != ObjectList<WorldEntity>::end(); ++it)
-        {
-            if((*it)->getIdentifier() == ClassByString(name))
+        for (WorldEntity* we : ObjectList<WorldEntity>())
+        {
+            if(we->getIdentifier() == ClassByString(name))
             {
                 ControllableEntity* controllable = this->getControllableEntity();
                 if(!controllable) continue;
-                float actualDistance = ( (*it)->getPosition() - controllable->getPosition() ).length();
+                float actualDistance = ( we->getPosition() - controllable->getPosition() ).length();
                 if(actualDistance > searchDistance || actualDistance < 5.0f) continue;
                     // TODO: PickupSpawner: adjust waypoint accuracy to PickupSpawner's triggerdistance
@@ -271 +271 @@
                 else
                 {
-                    waypoint = *it;
+                    waypoint = we;
                     break;
                 }