Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 10733


Ignore:
Timestamp:
Oct 31, 2015, 6:11:53 PM (8 years ago)
Author:
landauf
Message:

merged branch cpp11 to cpp11_v2

Location:
code/branches/cpp11_v2
Files:
56 edited

Legend:

Unmodified
Added
Removed
  • code/branches/cpp11_v2

  • code/branches/cpp11_v2/cmake/CompilerConfigGCC.cmake

    r9686 r10733  
    6464ADD_COMPILER_FLAGS("-Os"                   MinSizeRel     CACHE)
    6565
     66# Introducing c++11
     67# Note: there is also 'std=gnu++11', but that might not be portable to windows
     68ADD_COMPILER_FLAGS("-std=c++0x" CACHE)
     69
    6670# CMake doesn't seem to set the PIC flags right on certain 64 bit systems
    6771IF(NOT MINGW AND ${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64")
  • code/branches/cpp11_v2/src/external/ois/linux/LinuxJoyStickEvents.cpp

    r8351 r10733  
    3434#include <cassert>     
    3535#include <linux/input.h>
    36 
     36#include <unistd.h>
    3737
    3838#include <sstream>
  • code/branches/cpp11_v2/src/libraries/core/config/ConfigFile.cc

    r10624 r10733  
    3535
    3636#include <boost/filesystem.hpp>
     37
     38#include <iterator>
     39#include <algorithm>
    3740
    3841#include "util/Convert.h"
     
    9396                        try
    9497                        {
    95                             boost::filesystem::copy_file(defaultFilepath, filepath);
     98                            std::ifstream input(defaultFilepath.string().c_str(), std::ifstream::in | std::ifstream::binary);
     99                            std::ofstream output(filepath.string().c_str(), std::ofstream::out | std::ofstream::binary);
     100                            copy(std::istreambuf_iterator<char>(input), std::istreambuf_iterator<char>(), std::ostream_iterator<char>(output));
    96101                            orxout(internal_info, context::config) << "Copied " << this->filename_ << " from the default config folder." << endl;
    97102                        }
  • code/branches/cpp11_v2/src/libraries/core/object/ObjectListBase.h

    r9667 r10733  
    9393            }
    9494
     95            operator T*()
     96            {
     97                return object_;
     98            }
     99
    95100            T* object_;              //!< The object
    96101    };
  • code/branches/cpp11_v2/src/libraries/tools/BulletDebugDrawer.h

    r10277 r10733  
    1313#include <btBulletCollisionCommon.h>
    1414#include <OgreFrameListener.h>
     15#include <OgreVector3.h>
     16#include <OgreColourValue.h>
    1517
    1618namespace orxonox
  • code/branches/cpp11_v2/src/libraries/tools/OgreBulletUtils.h

    r10262 r10733  
    1010
    1111#include "tools/ToolsPrereqs.h"
     12#include <OgreVector3.h>
     13#include <OgreQuaternion.h>
     14#include <OgreColourValue.h>
     15#include <OgreMatrix3.h>
     16#include <OgreMatrix4.h>
    1217
    1318namespace orxonox
     
    4247    inline Ogre::Matrix3 matrix3(const btMatrix3x3& matrix)
    4348    {
    44         return Matrix3(
     49        return Ogre::Matrix3(
    4550                matrix[0][0], matrix[0][1], matrix[0][2],
    4651                matrix[1][0], matrix[1][1], matrix[1][2],
  • code/branches/cpp11_v2/src/libraries/util/SmallObjectAllocator.h

    r7401 r10733  
    7777#include "UtilPrereqs.h"
    7878#include <vector>
     79#include <cstdio>
    7980
    8081namespace orxonox
  • code/branches/cpp11_v2/src/modules/invader/Invader.cc

    r10624 r10733  
    129129    }
    130130
     131    void Invader::setCenterpoint(InvaderCenterPoint* center)
     132    {
     133        this->center_ = center;
     134    }
     135
    131136    void Invader::costLife()
    132137    {
  • code/branches/cpp11_v2/src/modules/invader/Invader.h

    r10624 r10733  
    3939
    4040#include "gametypes/Deathmatch.h"
    41 
    42 #include "InvaderCenterPoint.h"
    43 
    4441#include "tools/Timer.h"
    4542
     
    5855            void spawnEnemy();
    5956
    60             void setCenterpoint(InvaderCenterPoint* center)
    61             { this->center_ = center; }
     57            void setCenterpoint(InvaderCenterPoint* center);
    6258
    6359            int getLives(){return this->lives;}
  • code/branches/cpp11_v2/src/modules/invader/InvaderEnemy.cc

    r10625 r10733  
    3232*/
    3333
    34 #include "invader/InvaderPrereqs.h"
    3534#include "InvaderEnemy.h"
     35
     36#include "core/CoreIncludes.h"
     37#include "Invader.h"
    3638#include "InvaderShip.h"
    3739
  • code/branches/cpp11_v2/src/modules/invader/InvaderEnemy.h

    r10625 r10733  
    3737#include "invader/InvaderPrereqs.h"
    3838
    39 #include "worldentities/pawns/SpaceShip.h"
     39#include "worldentities/pawns/Pawn.h"
    4040
    4141namespace orxonox
  • code/branches/cpp11_v2/src/modules/invader/InvaderEnemyShooter.cc

    r10628 r10733  
    3232*/
    3333
    34 #include "invader/InvaderPrereqs.h"
    3534#include "InvaderEnemyShooter.h"
    36 // #include "worldentities/pawns/SpaceShip.h"
     35
     36#include "core/CoreIncludes.h"
     37#include "core/command/Executor.h"
     38#include "Invader.h"
     39#include "InvaderShip.h"
    3740
    3841namespace orxonox
  • code/branches/cpp11_v2/src/modules/invader/InvaderHUDinfo.cc

    r10624 r10733  
    3030#include "core/XMLPort.h"
    3131#include "util/Convert.h"
    32 // #include "Invader.h"
     32#include "Invader.h"
    3333
    3434namespace orxonox
  • code/branches/cpp11_v2/src/modules/invader/InvaderShip.cc

    r10624 r10733  
    3737#include "core/XMLPort.h"
    3838#include "Invader.h"
     39#include "InvaderEnemy.h"
     40#include "graphics/Camera.h"
     41#include "weapons/projectiles/Projectile.h"
    3942
    4043namespace orxonox
     
    139142        isFireing = bBoost;
    140143    }
     144    void InvaderShip::rotateRoll(const Vector2& value)
     145    {
     146        if (getGame())
     147            if (getGame()->bEndGame)
     148                getGame()->end();
     149    }
    141150    inline bool InvaderShip::collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint)
    142151    {
  • code/branches/cpp11_v2/src/modules/invader/InvaderShip.h

    r10624 r10733  
    3737#include "invader/InvaderPrereqs.h"
    3838
     39#include "weapons/WeaponsPrereqs.h"
    3940#include "worldentities/pawns/SpaceShip.h"
    40 #include "graphics/Camera.h"
    41 #include "weapons/projectiles/Projectile.h"
    4241
    4342namespace orxonox
     
    6160            virtual void rotatePitch(const Vector2& value){};
    6261            //return to main menu if game has ended.
    63             virtual void rotateRoll(const Vector2& value){if (getGame()) if (getGame()->bEndGame) getGame()->end();};
     62            virtual void rotateRoll(const Vector2& value);
    6463
    6564            virtual void updateLevel();
  • code/branches/cpp11_v2/src/modules/invader/InvaderWeapon.h

    r9943 r10733  
    3535#define _InvaderWeapon_H__
    3636
     37#include "invader/InvaderPrereqs.h"
     38
     39#include "weapons/WeaponsPrereqs.h"
    3740#include "weapons/weaponmodes/HsW01.h"
    38 #include "weapons/WeaponsPrereqs.h"
    39 
    40 #include "tools/Timer.h"
    4141
    4242namespace orxonox
  • code/branches/cpp11_v2/src/modules/invader/InvaderWeaponEnemy.cc

    r9945 r10733  
    3434#include "InvaderWeaponEnemy.h"
    3535
     36#include "core/CoreIncludes.h"
     37#include "weapons/projectiles/Projectile.h"
     38
    3639namespace orxonox
    3740{
  • code/branches/cpp11_v2/src/modules/invader/InvaderWeaponEnemy.h

    r9943 r10733  
    3535#define _InvaderWeaponEnemy_H__
    3636
    37 // #include "weapons/weaponmodes/HsW01.h"
    38 // #include "weapons/WeaponsPrereqs.h"
    39 #include "invader/InvaderWeapon.h"
     37#include "invader/InvaderPrereqs.h"
     38
     39#include "InvaderWeapon.h"
    4040#include "tools/Timer.h"
    4141
  • code/branches/cpp11_v2/src/modules/jump/Jump.cc

    r10262 r10733  
    3434#include "Jump.h"
    3535#include "core/CoreIncludes.h"
    36 #include "core/EventIncludes.h"
    37 #include "core/command/Executor.h"
    38 #include "core/config/ConfigValueIncludes.h"
    39 #include "gamestates/GSLevel.h"
    40 #include "chat/ChatManager.h"
     36
    4137#include "JumpCenterpoint.h"
    4238#include "JumpPlatform.h"
     
    5652#include "JumpBoots.h"
    5753#include "JumpShield.h"
     54
     55#include "gamestates/GSLevel.h"
    5856#include "infos/PlayerInfo.h"
     57#include "graphics/Camera.h"
    5958
    6059namespace orxonox
     
    7069        camera = 0;
    7170        setHUDTemplate("JumpHUD");
    72 
    73         setConfigValues();
    7471    }
    7572
     
    13001297        return figure_->dead_;
    13011298    }
     1299
     1300    void Jump::setCenterpoint(JumpCenterpoint* center)
     1301    {
     1302        center_ = center;
     1303    }
     1304
    13021305}
  • code/branches/cpp11_v2/src/modules/jump/Jump.h

    r10262 r10733  
    3131
    3232#include "jump/JumpPrereqs.h"
    33 #include "tools/Timer.h"
    34 #include "graphics/Camera.h"
    3533#include "gametypes/Deathmatch.h"
    36 #include "JumpCenterpoint.h"
    37 #include <list>
    3834
    3935namespace orxonox
     
    5147            float getFuel() const;
    5248            bool getDead(PlayerInfo* player) const;
    53             void setCenterpoint(JumpCenterpoint* center)
    54                 { center_ = center; }
     49            void setCenterpoint(JumpCenterpoint* center);
    5550            PlayerInfo* getPlayer() const;
    5651
  • code/branches/cpp11_v2/src/modules/jump/JumpBoots.cc

    r10262 r10733  
    3535
    3636#include "core/CoreIncludes.h"
    37 #include "core/GameMode.h"
    38 #include "graphics/Model.h"
    39 #include "gametypes/Gametype.h"
    40 
     37#include "core/XMLPort.h"
    4138#include "JumpFigure.h"
    42 
    43 #include "sound/WorldSound.h"
    44 #include "core/XMLPort.h"
    4539
    4640namespace orxonox
  • code/branches/cpp11_v2/src/modules/jump/JumpBoots.h

    r10262 r10733  
    3030#define _JumpBoots_H__
    3131
    32 #include "jump/JumpPrereqs.h"
    33 #include "util/Math.h"
    34 #include "worldentities/MovableEntity.h"
    35 
     32#include "JumpPrereqs.h"
     33#include "JumpItem.h"
    3634
    3735namespace orxonox
  • code/branches/cpp11_v2/src/modules/jump/JumpCenterpoint.cc

    r10624 r10733  
    3333
    3434#include "JumpCenterpoint.h"
     35
    3536#include "core/CoreIncludes.h"
    3637#include "core/XMLPort.h"
  • code/branches/cpp11_v2/src/modules/jump/JumpCenterpoint.h

    r10624 r10733  
    3131
    3232#include "jump/JumpPrereqs.h"
    33 
    34 #include <string>
    35 
    36 #include <util/Math.h>
    37 
    3833#include "worldentities/StaticEntity.h"
    3934
  • code/branches/cpp11_v2/src/modules/jump/JumpEnemy.cc

    r10624 r10733  
    3535
    3636#include "core/CoreIncludes.h"
    37 #include "core/GameMode.h"
    38 #include "graphics/Model.h"
    39 #include "gametypes/Gametype.h"
    40 
     37#include "core/XMLPort.h"
    4138#include "JumpFigure.h"
    42 
    43 #include "sound/WorldSound.h"
    44 #include "core/XMLPort.h"
    4539
    4640namespace orxonox
  • code/branches/cpp11_v2/src/modules/jump/JumpEnemy.h

    r10624 r10733  
    3737
    3838#include "jump/JumpPrereqs.h"
    39 
    40 #include "util/Math.h"
    41 
    4239#include "worldentities/MovableEntity.h"
    43 
    4440
    4541namespace orxonox
  • code/branches/cpp11_v2/src/modules/jump/JumpFigure.cc

    r10262 r10733  
    3636#include "core/CoreIncludes.h"
    3737#include "core/XMLPort.h"
     38#include "graphics/Model.h"
     39#include "JumpRocket.h"
     40#include "JumpPropeller.h"
     41#include "JumpBoots.h"
     42#include "JumpShield.h"
    3843
    3944namespace orxonox
  • code/branches/cpp11_v2/src/modules/jump/JumpItem.cc

    r10624 r10733  
    3535
    3636#include "core/CoreIncludes.h"
    37 #include "core/GameMode.h"
    38 #include "graphics/Model.h"
    39 #include "gametypes/Gametype.h"
    40 
     37#include "core/XMLPort.h"
    4138#include "JumpFigure.h"
    42 
    43 #include "sound/WorldSound.h"
    44 #include "core/XMLPort.h"
    4539
    4640namespace orxonox
  • code/branches/cpp11_v2/src/modules/jump/JumpItem.h

    r10624 r10733  
    3737
    3838#include "jump/JumpPrereqs.h"
    39 
    40 #include "util/Math.h"
    41 
    4239#include "worldentities/MovableEntity.h"
    4340
  • code/branches/cpp11_v2/src/modules/jump/JumpPlatform.cc

    r10632 r10733  
    3636#include "core/CoreIncludes.h"
    3737#include "core/GameMode.h"
    38 #include "graphics/Model.h"
    39 #include "gametypes/Gametype.h"
    40 
     38#include "core/XMLPort.h"
     39#include "sound/WorldSound.h"
    4140#include "JumpFigure.h"
    42 
    43 #include "sound/WorldSound.h"
    44 #include "core/XMLPort.h"
    4541
    4642namespace orxonox
  • code/branches/cpp11_v2/src/modules/jump/JumpPlatform.h

    r10632 r10733  
    3636#define _JumpPlatform_H__
    3737
    38 #include "jump/JumpPrereqs.h"
    39 #include "util/Math.h"
     38#include "JumpPrereqs.h"
    4039#include "worldentities/MovableEntity.h"
    4140
  • code/branches/cpp11_v2/src/modules/jump/JumpPlatformDisappear.cc

    r10262 r10733  
    3535
    3636#include "core/CoreIncludes.h"
    37 #include "core/GameMode.h"
    38 
    39 #include "gametypes/Gametype.h"
    40 
     37#include "core/XMLPort.h"
    4138#include "JumpFigure.h"
    42 
    43 #include "sound/WorldSound.h"
    44 #include "core/XMLPort.h"
    4539
    4640namespace orxonox
  • code/branches/cpp11_v2/src/modules/jump/JumpPlatformDisappear.h

    r10262 r10733  
    3636#define _JumpPlatformDisappear_H__
    3737
    38 #include "jump/JumpPrereqs.h"
    39 #include "util/Math.h"
    40 #include "worldentities/MovableEntity.h"
     38#include "JumpPrereqs.h"
     39#include "JumpPlatform.h"
    4140
    4241namespace orxonox
  • code/branches/cpp11_v2/src/modules/jump/JumpPlatformFake.cc

    r10262 r10733  
    3333
    3434#include "JumpPlatformFake.h"
     35
    3536#include "core/CoreIncludes.h"
    36 #include "core/GameMode.h"
    37 #include "gametypes/Gametype.h"
    38 #include "JumpFigure.h"
    39 #include "sound/WorldSound.h"
    4037#include "core/XMLPort.h"
    4138
  • code/branches/cpp11_v2/src/modules/jump/JumpPlatformFake.h

    r10262 r10733  
    3636#define _JumpPlatformFake_H__
    3737
    38 #include "jump/JumpPrereqs.h"
    39 
    40 #include "util/Math.h"
    41 
    42 #include "worldentities/MovableEntity.h"
    43 
     38#include "JumpPrereqs.h"
     39#include "JumpPlatform.h"
    4440
    4541namespace orxonox
  • code/branches/cpp11_v2/src/modules/jump/JumpPlatformHMove.cc

    r10262 r10733  
    3333
    3434#include "JumpPlatformHMove.h"
     35
    3536#include "core/CoreIncludes.h"
    36 #include "core/GameMode.h"
    37 #include "gametypes/Gametype.h"
     37#include "core/XMLPort.h"
    3838#include "JumpFigure.h"
    39 #include "sound/WorldSound.h"
    40 #include "core/XMLPort.h"
    4139
    4240namespace orxonox
  • code/branches/cpp11_v2/src/modules/jump/JumpPlatformHMove.h

    r10262 r10733  
    3030#define _JumpPlatformHMove_H__
    3131
    32 #include "jump/JumpPrereqs.h"
    33 
    34 #include "util/Math.h"
    35 
    36 #include "worldentities/MovableEntity.h"
    37 
     32#include "JumpPrereqs.h"
     33#include "JumpPlatform.h"
    3834
    3935namespace orxonox
  • code/branches/cpp11_v2/src/modules/jump/JumpPlatformStatic.cc

    r10262 r10733  
    3333
    3434#include "JumpPlatformStatic.h"
     35
    3536#include "core/CoreIncludes.h"
    36 #include "core/GameMode.h"
    37 #include "gametypes/Gametype.h"
     37#include "core/XMLPort.h"
    3838#include "JumpFigure.h"
    39 #include "sound/WorldSound.h"
    40 #include "core/XMLPort.h"
    4139
    4240namespace orxonox
  • code/branches/cpp11_v2/src/modules/jump/JumpPlatformStatic.h

    r10262 r10733  
    3030#define _JumpPlatformStatic_H__
    3131
    32 #include "jump/JumpPrereqs.h"
    33 
    34 #include "util/Math.h"
    35 
    36 #include "worldentities/MovableEntity.h"
    37 
     32#include "JumpPrereqs.h"
     33#include "JumpPlatform.h"
    3834
    3935namespace orxonox
  • code/branches/cpp11_v2/src/modules/jump/JumpPlatformTimer.cc

    r10262 r10733  
    3333
    3434#include "JumpPlatformTimer.h"
     35
    3536#include "core/CoreIncludes.h"
    36 #include "core/GameMode.h"
    37 #include "gametypes/Gametype.h"
     37#include "core/XMLPort.h"
     38#include "graphics/ParticleSpawner.h"
    3839#include "JumpFigure.h"
    39 #include "sound/WorldSound.h"
    40 #include "core/XMLPort.h"
    4140
    4241namespace orxonox
  • code/branches/cpp11_v2/src/modules/jump/JumpPlatformTimer.h

    r10262 r10733  
    3636#define _JumpPlatformTimer_H__
    3737
    38 #include "jump/JumpPrereqs.h"
    39 
    40 #include "util/Math.h"
    41 
    42 #include "worldentities/MovableEntity.h"
    43 #include "graphics/ParticleSpawner.h"
    44 
     38#include "JumpPrereqs.h"
     39#include "JumpPlatform.h"
    4540
    4641namespace orxonox
  • code/branches/cpp11_v2/src/modules/jump/JumpPlatformVMove.cc

    r10262 r10733  
    3333
    3434#include "JumpPlatformVMove.h"
     35
    3536#include "core/CoreIncludes.h"
    36 #include "core/GameMode.h"
    37 #include "gametypes/Gametype.h"
     37#include "core/XMLPort.h"
    3838#include "JumpFigure.h"
    39 #include "sound/WorldSound.h"
    40 #include "core/XMLPort.h"
    4139
    4240namespace orxonox
  • code/branches/cpp11_v2/src/modules/jump/JumpPlatformVMove.h

    r10262 r10733  
    3030#define _JumpPlatformVMove_H__
    3131
    32 #include "jump/JumpPrereqs.h"
    33 #include "util/Math.h"
    34 #include "worldentities/MovableEntity.h"
     32#include "JumpPrereqs.h"
     33#include "JumpPlatform.h"
    3534
    3635namespace orxonox
  • code/branches/cpp11_v2/src/modules/jump/JumpProjectile.cc

    r10624 r10733  
    3333
    3434#include "JumpProjectile.h"
     35
    3536#include "core/CoreIncludes.h"
    36 #include "core/GameMode.h"
    37 #include "graphics/Model.h"
    38 #include "gametypes/Gametype.h"
     37#include "core/XMLPort.h"
    3938#include "JumpFigure.h"
    40 #include "sound/WorldSound.h"
    41 #include "core/XMLPort.h"
     39#include "JumpEnemy.h"
    4240
    4341namespace orxonox
  • code/branches/cpp11_v2/src/modules/jump/JumpPropeller.cc

    r10262 r10733  
    3535
    3636#include "core/CoreIncludes.h"
    37 #include "core/GameMode.h"
    38 #include "graphics/Model.h"
    39 #include "gametypes/Gametype.h"
    40 
     37#include "core/XMLPort.h"
    4138#include "JumpFigure.h"
    42 
    43 #include "sound/WorldSound.h"
    44 #include "core/XMLPort.h"
    4539
    4640namespace orxonox
  • code/branches/cpp11_v2/src/modules/jump/JumpPropeller.h

    r10262 r10733  
    3030#define _JumpPropeller_H__
    3131
    32 #include "jump/JumpPrereqs.h"
    33 
    34 #include "util/Math.h"
    35 
    36 #include "worldentities/MovableEntity.h"
    37 
     32#include "JumpPrereqs.h"
     33#include "JumpItem.h"
    3834
    3935namespace orxonox
  • code/branches/cpp11_v2/src/modules/jump/JumpRocket.cc

    r10262 r10733  
    3333
    3434#include "JumpRocket.h"
     35
    3536#include "core/CoreIncludes.h"
    36 #include "core/GameMode.h"
    37 #include "graphics/Model.h"
    38 #include "gametypes/Gametype.h"
     37#include "core/XMLPort.h"
    3938#include "JumpFigure.h"
    40 #include "sound/WorldSound.h"
    41 #include "core/XMLPort.h"
    4239
    4340namespace orxonox
  • code/branches/cpp11_v2/src/modules/jump/JumpRocket.h

    r10262 r10733  
    3030#define _JumpRocket_H__
    3131
    32 #include "jump/JumpPrereqs.h"
    33 #include "util/Math.h"
    34 #include "worldentities/MovableEntity.h"
     32#include "JumpPrereqs.h"
     33#include "JumpItem.h"
    3534
    3635namespace orxonox
  • code/branches/cpp11_v2/src/modules/jump/JumpScore.cc

    r10624 r10733  
    3333
    3434#include "JumpScore.h"
     35
    3536#include "core/CoreIncludes.h"
    3637#include "core/XMLPort.h"
     
    3839#include "infos/PlayerInfo.h"
    3940#include "Jump.h"
    40 #include "sound/WorldSound.h"
    4141
    4242namespace orxonox
  • code/branches/cpp11_v2/src/modules/jump/JumpShield.cc

    r10262 r10733  
    3535
    3636#include "core/CoreIncludes.h"
    37 #include "core/GameMode.h"
    38 #include "graphics/Model.h"
    39 #include "gametypes/Gametype.h"
    40 
     37#include "core/XMLPort.h"
    4138#include "JumpFigure.h"
    42 
    43 #include "sound/WorldSound.h"
    44 #include "core/XMLPort.h"
    4539
    4640namespace orxonox
  • code/branches/cpp11_v2/src/modules/jump/JumpShield.h

    r10262 r10733  
    3030#define _JumpShield_H__
    3131
    32 #include "jump/JumpPrereqs.h"
    33 
    34 #include "util/Math.h"
    35 
    36 #include "worldentities/MovableEntity.h"
    37 
     32#include "JumpPrereqs.h"
     33#include "JumpItem.h"
    3834
    3935namespace orxonox
  • code/branches/cpp11_v2/src/modules/jump/JumpSpring.cc

    r10262 r10733  
    3333
    3434#include "JumpSpring.h"
     35
    3536#include "core/CoreIncludes.h"
    36 #include "core/GameMode.h"
    37 #include "graphics/Model.h"
    38 #include "gametypes/Gametype.h"
     37#include "core/XMLPort.h"
    3938#include "JumpFigure.h"
    40 #include "sound/WorldSound.h"
    41 #include "core/XMLPort.h"
    4239
    4340namespace orxonox
  • code/branches/cpp11_v2/src/modules/jump/JumpSpring.h

    r10262 r10733  
    3030#define _JumpSpring_H__
    3131
    32 #include "jump/JumpPrereqs.h"
    33 
    34 #include "util/Math.h"
    35 
    36 #include "worldentities/MovableEntity.h"
    37 
     32#include "JumpPrereqs.h"
     33#include "JumpItem.h"
    3834
    3935namespace orxonox
  • code/branches/cpp11_v2/src/orxonox/chat/ChatManager.cc

    r10624 r10733  
    107107
    108108        // notify all listeners
    109         for (ObjectList<ChatListener>::iterator it = ObjectList<ChatListener>::begin(); it != ObjectList<ChatListener>::end(); ++it)
    110             it->incomingChat(text, name);
     109        for (ChatListener* listener : ObjectList<ChatListener>())
     110            listener->incomingChat(text, name);
    111111    }
    112112
  • code/branches/cpp11_v2/src/orxonox/controllers/ArtificialController.cc

    r10631 r10733  
    207207    void ArtificialController::setAllBotLevel(float level)
    208208    {
    209         for (ObjectList<ArtificialController>::iterator it = ObjectList<ArtificialController>::begin(); it != ObjectList<ArtificialController>::end(); ++it)
    210             it->setBotLevel(level);
     209        for (ArtificialController* controller : ObjectList<ArtificialController>())
     210            controller->setBotLevel(level);
    211211    }
    212212
     
    231231    int ArtificialController::getFiremode(std::string name)
    232232    {
    233         for (std::map< std::string, int >::iterator it = this->weaponModes_.begin(); it != this->weaponModes_.end(); ++it)
    234         {
    235             if (it->first == name)
    236                 return it->second;
     233        for (auto firemode : this->weaponModes_)
     234        {
     235            if (firemode.first == name)
     236                return firemode.second;
    237237        }
    238238        return -1;
     
    259259    {
    260260        WorldEntity* waypoint = NULL;
    261         for (ObjectList<WorldEntity>::iterator it = ObjectList<WorldEntity>::begin(); it != ObjectList<WorldEntity>::end(); ++it)
    262         {
    263             if((*it)->getIdentifier() == ClassByString(name))
     261        for (WorldEntity* we : ObjectList<WorldEntity>())
     262        {
     263            if(we->getIdentifier() == ClassByString(name))
    264264            {
    265265                ControllableEntity* controllable = this->getControllableEntity();
    266266                if(!controllable) continue;
    267                 float actualDistance = ( (*it)->getPosition() - controllable->getPosition() ).length();
     267                float actualDistance = ( we->getPosition() - controllable->getPosition() ).length();
    268268                if(actualDistance > searchDistance || actualDistance < 5.0f) continue;
    269269                    // TODO: PickupSpawner: adjust waypoint accuracy to PickupSpawner's triggerdistance
     
    271271                else
    272272                {
    273                     waypoint = *it;
     273                    waypoint = we;
    274274                    break;
    275275                }
Note: See TracChangeset for help on using the changeset viewer.