Context Navigation

← Previous Change
Next Change →

Changeset 5735 for code/branches

Timestamp:

Sep 1, 2009, 12:38:36 AM (15 years ago)

Author:

landauf

Message:

Removed /objects/ from all paths (except from those in the objects module of course).
Compiles again.

Location:

code/branches/libraries2/src

Files:

: 131 edited

modules/gamestates/GSLevel.cc (modified) (1 diff)
modules/gamestates/GSMainMenu.cc (modified) (1 diff)
modules/objects/Attacher.h (modified) (1 diff)
modules/objects/ForceField.cc (modified) (2 diffs)
modules/objects/ForceField.h (modified) (1 diff)
modules/objects/Planet.cc (modified) (1 diff)
modules/objects/Planet.h (modified) (1 diff)
modules/objects/collisionshapes/BoxCollisionShape.h (modified) (1 diff)
modules/objects/collisionshapes/ConeCollisionShape.h (modified) (1 diff)
modules/objects/collisionshapes/PlaneCollisionShape.h (modified) (1 diff)
modules/objects/collisionshapes/SphereCollisionShape.h (modified) (1 diff)
modules/objects/triggers/CheckPoint.cc (modified) (1 diff)
modules/objects/triggers/DistanceTrigger.cc (modified) (1 diff)
modules/objects/triggers/Trigger.cc (modified) (1 diff)
modules/objects/triggers/Trigger.h (modified) (1 diff)
modules/overlays/GUIOverlay.cc (modified) (1 diff)
modules/overlays/hud/AnnounceMessage.cc (modified) (1 diff)
modules/overlays/hud/ChatOverlay.cc (modified) (1 diff)
modules/overlays/hud/DeathMessage.cc (modified) (1 diff)
modules/overlays/hud/GametypeStatus.cc (modified) (1 diff)
modules/overlays/hud/HUDHealthBar.cc (modified) (1 diff)
modules/overlays/hud/HUDNavigation.cc (modified) (1 diff)
modules/overlays/hud/HUDRadar.cc (modified) (1 diff)
modules/overlays/hud/HUDSpeedBar.cc (modified) (1 diff)
modules/overlays/hud/HUDTimer.cc (modified) (1 diff)
modules/overlays/hud/KillMessage.cc (modified) (1 diff)
modules/overlays/hud/TeamBaseMatchScore.cc (modified) (1 diff)
modules/overlays/hud/UnderAttackHealthBar.cc (modified) (1 diff)
modules/overlays/stats/Scoreboard.cc (modified) (1 diff)
modules/pong/Pong.h (modified) (1 diff)
modules/pong/PongAI.cc (modified) (1 diff)
modules/pong/PongAI.h (modified) (1 diff)
modules/pong/PongBall.cc (modified) (1 diff)
modules/pong/PongBall.h (modified) (1 diff)
modules/pong/PongBat.h (modified) (1 diff)
modules/pong/PongBot.h (modified) (1 diff)
modules/pong/PongCenterpoint.h (modified) (1 diff)
modules/pong/PongScore.cc (modified) (1 diff)
modules/questsystem/QuestEffectBeacon.cc (modified) (1 diff)
modules/questsystem/QuestEffectBeacon.h (modified) (1 diff)
modules/questsystem/QuestManager.cc (modified) (1 diff)
modules/weapons/MuzzleFlash.h (modified) (1 diff)
modules/weapons/munitions/FusionMunition.h (modified) (1 diff)
modules/weapons/munitions/ReplenishingMunition.h (modified) (1 diff)
modules/weapons/projectiles/BillboardProjectile.cc (modified) (2 diffs)
modules/weapons/projectiles/ParticleProjectile.cc (modified) (1 diff)
modules/weapons/projectiles/Projectile.cc (modified) (1 diff)
modules/weapons/projectiles/Projectile.h (modified) (1 diff)
modules/weapons/weaponmodes/EnergyDrink.cc (modified) (1 diff)
modules/weapons/weaponmodes/EnergyDrink.h (modified) (1 diff)
modules/weapons/weaponmodes/FusionFire.cc (modified) (1 diff)
modules/weapons/weaponmodes/FusionFire.h (modified) (1 diff)
modules/weapons/weaponmodes/HsW01.cc (modified) (1 diff)
modules/weapons/weaponmodes/HsW01.h (modified) (1 diff)
modules/weapons/weaponmodes/LaserFire.cc (modified) (1 diff)
modules/weapons/weaponmodes/LaserFire.h (modified) (1 diff)
modules/weapons/weaponmodes/LightningGun.cc (modified) (1 diff)
modules/weapons/weaponmodes/LightningGun.h (modified) (1 diff)
orxonox/CMakeLists.txt (modified) (1 diff)
orxonox/CameraManager.cc (modified) (1 diff)
orxonox/GlobalShader.cc (modified) (1 diff)
orxonox/Level.cc (modified) (1 diff)
orxonox/LevelManager.cc (modified) (1 diff)
orxonox/OrxonoxPrereqs.h (modified) (2 diffs)
orxonox/PawnManager.cc (modified) (1 diff)
orxonox/PlayerManager.cc (modified) (1 diff)
orxonox/Scene.cc (modified) (1 diff)
orxonox/collisionshapes/CollisionShape.cc (modified) (1 diff)
orxonox/collisionshapes/WorldEntityCollisionShape.cc (modified) (1 diff)
orxonox/controllers/AIController.cc (modified) (1 diff)
orxonox/controllers/ArtificialController.cc (modified) (1 diff)
orxonox/controllers/HumanController.cc (modified) (1 diff)
orxonox/controllers/WaypointController.cc (modified) (1 diff)
orxonox/controllers/WaypointPatrolController.cc (modified) (1 diff)
orxonox/gametypes/Asteroids.cc (modified) (1 diff)
orxonox/gametypes/Deathmatch.cc (modified) (1 diff)
orxonox/gametypes/Gametype.cc (modified) (1 diff)
orxonox/gametypes/Gametype.h (modified) (1 diff)
orxonox/gametypes/TeamBaseMatch.cc (modified) (1 diff)
orxonox/gametypes/TeamDeathmatch.cc (modified) (1 diff)
orxonox/gametypes/UnderAttack.cc (modified) (1 diff)
orxonox/infos/Bot.cc (modified) (1 diff)
orxonox/infos/HumanPlayer.cc (modified) (1 diff)
orxonox/infos/PlayerInfo.cc (modified) (1 diff)
orxonox/infos/PlayerInfo.h (modified) (1 diff)
orxonox/interfaces/RadarViewable.cc (modified) (1 diff)
orxonox/items/Engine.cc (modified) (1 diff)
orxonox/items/MultiStateEngine.cc (modified) (1 diff)
orxonox/overlays/Map.cc (modified) (1 diff)
orxonox/pickup/BaseItem.cc (modified) (1 diff)
orxonox/pickup/DroppedItem.cc (modified) (1 diff)
orxonox/pickup/DroppedItem.h (modified) (1 diff)
orxonox/pickup/ModifierPickup.cc (modified) (1 diff)
orxonox/pickup/PickupInventory.cc (modified) (1 diff)
orxonox/pickup/PickupSpawner.cc (modified) (1 diff)
orxonox/pickup/PickupSpawner.h (modified) (1 diff)
orxonox/pickup/items/HealthImmediate.cc (modified) (1 diff)
orxonox/pickup/items/HealthImmediate.h (modified) (1 diff)
orxonox/pickup/items/HealthUsable.cc (modified) (1 diff)
orxonox/pickup/items/HealthUsable.h (modified) (1 diff)
orxonox/pickup/items/Jump.cc (modified) (1 diff)
orxonox/pickup/items/Jump.h (modified) (1 diff)
orxonox/sound/SoundBase.cc (modified) (1 diff)
orxonox/sound/SoundManager.cc (modified) (1 diff)
orxonox/weaponsystem/Weapon.h (modified) (1 diff)
orxonox/weaponsystem/WeaponSlot.h (modified) (1 diff)
orxonox/weaponsystem/WeaponSystem.cc (modified) (1 diff)
orxonox/worldentities/Backlight.cc (modified) (1 diff)
orxonox/worldentities/BigExplosion.cc (modified) (1 diff)
orxonox/worldentities/Billboard.cc (modified) (2 diffs)
orxonox/worldentities/Camera.cc (modified) (1 diff)
orxonox/worldentities/Camera.h (modified) (1 diff)
orxonox/worldentities/CameraPosition.h (modified) (1 diff)
orxonox/worldentities/ControllableEntity.cc (modified) (2 diffs)
orxonox/worldentities/ExplosionChunk.cc (modified) (1 diff)
orxonox/worldentities/Light.cc (modified) (1 diff)
orxonox/worldentities/MobileEntity.cc (modified) (1 diff)
orxonox/worldentities/Model.cc (modified) (1 diff)
orxonox/worldentities/MovableEntity.cc (modified) (1 diff)
orxonox/worldentities/ParticleEmitter.cc (modified) (1 diff)
orxonox/worldentities/SpawnPoint.cc (modified) (1 diff)
orxonox/worldentities/SpawnPoint.h (modified) (1 diff)
orxonox/worldentities/TeamSpawnPoint.h (modified) (1 diff)
orxonox/worldentities/WorldEntity.cc (modified) (1 diff)
orxonox/worldentities/pawns/Destroyer.cc (modified) (1 diff)
orxonox/worldentities/pawns/Pawn.cc (modified) (1 diff)
orxonox/worldentities/pawns/Pawn.h (modified) (2 diffs)
orxonox/worldentities/pawns/SpaceShip.cc (modified) (1 diff)
orxonox/worldentities/pawns/Spectator.cc (modified) (1 diff)
orxonox/worldentities/pawns/Spectator.h (modified) (1 diff)
orxonox/worldentities/pawns/TeamBaseMatchBase.cc (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed

code/branches/libraries2/src/modules/gamestates/GSLevel.cc

r5695	r5735
48	48
49	49	#include "tools/interfaces/Tickable.h"
50		#include "~~objects/~~Radar.h"
	50	#include "Radar.h"
51	51	#include "CameraManager.h"
52	52	#include "LevelManager.h"

code/branches/libraries2/src/modules/gamestates/GSMainMenu.cc

r5695	r5735
38	38	#include "core/GraphicsManager.h"
39	39	#include "core/GUIManager.h"
40		#include "~~objects/~~Scene.h"
	40	#include "Scene.h"
41	41	#include "sound/SoundMainMenu.h"
42	42

code/branches/libraries2/src/modules/objects/Attacher.h

r5730	r5735
35	35	#include <string>
36	36	#include "core/XMLNameListener.h"
37		#include "~~objects/~~worldentities/StaticEntity.h"
	37	#include "worldentities/StaticEntity.h"
38	38
39	39	namespace orxonox

code/branches/libraries2/src/modules/objects/ForceField.cc

-                      r5728
+                      r5735
 #include "core/CoreIncludes.h"
 #include "core/XMLPort.h"
 #include "objects/worldentities/MobileEntity.h"
+#include "worldentities/MobileEntity.h"
 namespace orxonox
 …
+    {
         SUPER(ForceField, XMLPort, xmlelement, mode);
         //For correct xml import use: position, direction, velocity, scale
         XMLPortParam(ForceField, "velocity", setVelocity, getVelocity, xmlelement, mode).defaultValues(100);

code/branches/libraries2/src/modules/objects/ForceField.h

r5730	r5735
34	34
35	35	#include "tools/interfaces/Tickable.h"
36		#include "~~objects/~~worldentities/StaticEntity.h"
	36	#include "worldentities/StaticEntity.h"
37	37
38	38	namespace orxonox

code/branches/libraries2/src/modules/objects/Planet.cc

-                      r5730
+                      r5735
 #include "core/GameMode.h"
 #include "core/XMLPort.h"
 #include "objects/Scene.h"
 #include "objects/worldentities/Camera.h"
+#include "Scene.h"
+#include "worldentities/Camera.h"
 #include "CameraManager.h"

code/branches/libraries2/src/modules/objects/Planet.h

r5730	r5735
35	35	#include "tools/BillboardSet.h"
36	36	#include "tools/Mesh.h"
37		#include "~~objects/~~worldentities/MovableEntity.h"
	37	#include "worldentities/MovableEntity.h"
38	38
39	39	namespace orxonox

code/branches/libraries2/src/modules/objects/collisionshapes/BoxCollisionShape.h

r5730	r5735
33	33
34	34	#include "util/Math.h"
35		#include "~~objects/~~collisionshapes/CollisionShape.h"
	35	#include "collisionshapes/CollisionShape.h"
36	36
37	37	namespace orxonox

code/branches/libraries2/src/modules/objects/collisionshapes/ConeCollisionShape.h

r5730	r5735
31	31
32	32	#include "objects/ObjectsPrereqs.h"
33		#include "~~objects/~~collisionshapes/CollisionShape.h"
	33	#include "collisionshapes/CollisionShape.h"
34	34
35	35	namespace orxonox

code/branches/libraries2/src/modules/objects/collisionshapes/PlaneCollisionShape.h

r5730	r5735
33	33
34	34	#include "util/Math.h"
35		#include "~~objects/~~collisionshapes/CollisionShape.h"
	35	#include "collisionshapes/CollisionShape.h"
36	36
37	37	namespace orxonox

code/branches/libraries2/src/modules/objects/collisionshapes/SphereCollisionShape.h

r5730	r5735
31	31
32	32	#include "objects/ObjectsPrereqs.h"
33		#include "~~objects/~~collisionshapes/CollisionShape.h"
	33	#include "collisionshapes/CollisionShape.h"
34	34
35	35	namespace orxonox

code/branches/libraries2/src/modules/objects/triggers/CheckPoint.cc

-                      r3325
+                      r5735
 #include "core/CoreIncludes.h"
 #include "core/XMLPort.h"
 #include "objects/gametypes/Asteroids.h"
 #include "objects/worldentities/pawns/Pawn.h"
+#include "gametypes/Asteroids.h"
+#include "worldentities/pawns/Pawn.h"
 namespace orxonox

code/branches/libraries2/src/modules/objects/triggers/DistanceTrigger.cc

r5728	r5735
31	31	#include "core/CoreIncludes.h"
32	32	#include "core/XMLPort.h"
33		#include "~~objects/~~worldentities/pawns/Pawn.h"
	33	#include "worldentities/pawns/Pawn.h"
34	34
35	35	namespace orxonox

code/branches/libraries2/src/modules/objects/triggers/Trigger.cc

r3280	r5735
33	33	#include "core/GameMode.h"
34	34	#include "core/XMLPort.h"
35		#include "~~objects/~~Scene.h"
	35	#include "Scene.h"
36	36
37	37	namespace orxonox

code/branches/libraries2/src/modules/objects/triggers/Trigger.h

r5730	r5735
37	37	#include "tools/BillboardSet.h"
38	38	#include "tools/interfaces/Tickable.h"
39		#include "~~objects/~~worldentities/StaticEntity.h"
	39	#include "worldentities/StaticEntity.h"
40	40
41	41	namespace orxonox

code/branches/libraries2/src/modules/overlays/GUIOverlay.cc

r5720	r5735
36	36	#include "core/GUIManager.h"
37	37	#include "core/XMLPort.h"
38		#include "~~objects/~~infos/PlayerInfo.h"
	38	#include "infos/PlayerInfo.h"
39	39
40	40	namespace orxonox

code/branches/libraries2/src/modules/overlays/hud/AnnounceMessage.cc

r3325	r5735
30	30
31	31	#include "core/CoreIncludes.h"
32		#include "~~objects/~~infos/PlayerInfo.h"
	32	#include "infos/PlayerInfo.h"
33	33
34	34	namespace orxonox

code/branches/libraries2/src/modules/overlays/hud/ChatOverlay.cc

r3196	r5735
39	39
40	40	#include "tools/Timer.h"
41		#include "~~objects/~~infos/PlayerInfo.h"
	41	#include "infos/PlayerInfo.h"
42	42	#include "PlayerManager.h"
43	43

code/branches/libraries2/src/modules/overlays/hud/DeathMessage.cc

r3325	r5735
30	30
31	31	#include "core/CoreIncludes.h"
32		#include "~~objects/~~infos/PlayerInfo.h"
	32	#include "infos/PlayerInfo.h"
33	33
34	34	namespace orxonox

code/branches/libraries2/src/modules/overlays/hud/GametypeStatus.cc

-                      r3325
+                      r5735
 #include "util/Convert.h"
 #include "core/CoreIncludes.h"
 #include "objects/infos/GametypeInfo.h"
 #include "objects/infos/PlayerInfo.h"
 #include "objects/worldentities/ControllableEntity.h"
 #include "objects/worldentities/pawns/Spectator.h"
+#include "infos/GametypeInfo.h"
+#include "infos/PlayerInfo.h"
+#include "worldentities/ControllableEntity.h"
+#include "worldentities/pawns/Spectator.h"
 namespace orxonox

code/branches/libraries2/src/modules/overlays/hud/HUDHealthBar.cc

r3325	r5735
32	32	#include "core/CoreIncludes.h"
33	33	#include "core/XMLPort.h"
34		#include "~~objects/~~worldentities/pawns/Pawn.h"
	34	#include "worldentities/pawns/Pawn.h"
35	35	#include "overlays/OverlayGroup.h"
36	36

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

r3301	r5735
39	39	#include "core/CoreIncludes.h"
40	40	#include "core/XMLPort.h"
41		#include "~~objects/~~Radar.h"
	41	#include "Radar.h"
42	42
43	43	namespace orxonox

code/branches/libraries2/src/modules/overlays/hud/HUDRadar.cc

-                      r3325
+                      r5735
 #include "core/XMLPort.h"
 #include "tools/TextureGenerator.h"
 #include "objects/worldentities/WorldEntity.h"
 #include "objects/worldentities/pawns/Pawn.h"
+#include "worldentities/WorldEntity.h"
+#include "worldentities/pawns/Pawn.h"
 namespace orxonox

code/branches/libraries2/src/modules/overlays/hud/HUDSpeedBar.cc

-                      r3325
+                      r5735
 #include "core/CoreIncludes.h"
 #include "objects/worldentities/pawns/SpaceShip.h"
 #include "objects/items/Engine.h"
+#include "worldentities/pawns/SpaceShip.h"
+#include "items/Engine.h"
 namespace orxonox

code/branches/libraries2/src/modules/overlays/hud/HUDTimer.cc

-                      r3325
+                      r5735
 #include "util/Convert.h"
 #include "core/CoreIncludes.h"
 #include "objects/worldentities/ControllableEntity.h"
 #include "objects/gametypes/Gametype.h"
+#include "worldentities/ControllableEntity.h"
+#include "gametypes/Gametype.h"
 namespace orxonox

code/branches/libraries2/src/modules/overlays/hud/KillMessage.cc

r3325	r5735
30	30
31	31	#include "core/CoreIncludes.h"
32		#include "~~objects/~~infos/PlayerInfo.h"
	32	#include "infos/PlayerInfo.h"
33	33
34	34	namespace orxonox

code/branches/libraries2/src/modules/overlays/hud/TeamBaseMatchScore.cc

-                      r3325
+                      r5735
 #include "core/XMLPort.h"
 #include "util/Convert.h"
 #include "objects/gametypes/TeamBaseMatch.h"
 #include "objects/infos/PlayerInfo.h"
+#include "gametypes/TeamBaseMatch.h"
+#include "infos/PlayerInfo.h"
 namespace orxonox

code/branches/libraries2/src/modules/overlays/hud/UnderAttackHealthBar.cc

-                      r3325
+                      r5735
 #include "core/CoreIncludes.h"
 #include "core/XMLPort.h"
 #include "objects/infos/PlayerInfo.h"
 #include "objects/gametypes/UnderAttack.h"
 #include "objects/worldentities/pawns/Destroyer.h"
+#include "infos/PlayerInfo.h"
+#include "gametypes/UnderAttack.h"
+#include "worldentities/pawns/Destroyer.h"
 namespace orxonox

code/branches/libraries2/src/modules/overlays/stats/Scoreboard.cc

-                      r3196
+                      r5735
 #include "util/Convert.h"
 #include "core/CoreIncludes.h"
 #include "objects/gametypes/Gametype.h"
 #include "objects/infos/PlayerInfo.h"
+#include "gametypes/Gametype.h"
+#include "infos/PlayerInfo.h"
 #include "CreateLines.h"

code/branches/libraries2/src/modules/pong/Pong.h

r5725	r5735
33	33
34	34	#include "tools/Timer.h"
35		#include "~~objects/~~gametypes/Deathmatch.h"
	35	#include "gametypes/Deathmatch.h"
36	36
37	37	namespace orxonox

code/branches/libraries2/src/modules/pong/PongAI.cc

r5725	r5735
32	32	#include "core/ConfigValueIncludes.h"
33	33	#include "tools/Timer.h"
34		#include "~~objects/~~worldentities/ControllableEntity.h"
	34	#include "worldentities/ControllableEntity.h"
35	35	#include "PongBall.h"
36	36

code/branches/libraries2/src/modules/pong/PongAI.h

r5725	r5735
35	35	#include "util/Math.h"
36	36	#include "tools/interfaces/Tickable.h"
37		#include "~~objects/~~controllers/Controller.h"
	37	#include "controllers/Controller.h"
38	38
39	39	namespace orxonox

code/branches/libraries2/src/modules/pong/PongBall.cc

r5725	r5735
31	31	#include "core/CoreIncludes.h"
32	32	#include "core/GameMode.h"
33		#include "~~objects/~~gametypes/Gametype.h"
	33	#include "gametypes/Gametype.h"
34	34	#include "PongBat.h"
35	35	#include "sound/SoundBase.h"

code/branches/libraries2/src/modules/pong/PongBall.h

r5725	r5735
33	33
34	34	#include "util/Math.h"
35		#include "~~objects/~~worldentities/MovableEntity.h"
	35	#include "worldentities/MovableEntity.h"
36	36
37	37	namespace orxonox

code/branches/libraries2/src/modules/pong/PongBat.h

r5725	r5735
31	31
32	32	#include "pong/PongPrereqs.h"
33		#include "~~objects/~~worldentities/ControllableEntity.h"
	33	#include "worldentities/ControllableEntity.h"
34	34
35	35	namespace orxonox

code/branches/libraries2/src/modules/pong/PongBot.h

r5725	r5735
31	31
32	32	#include "pong/PongPrereqs.h"
33		#include "~~objects/~~infos/Bot.h"
	33	#include "infos/Bot.h"
34	34
35	35	namespace orxonox

code/branches/libraries2/src/modules/pong/PongCenterpoint.h

r5725	r5735
34	34	#include <string>
35	35	#include <util/Math.h>
36		#include "~~objects/~~worldentities/StaticEntity.h"
	36	#include "worldentities/StaticEntity.h"
37	37
38	38	namespace orxonox

code/branches/libraries2/src/modules/pong/PongScore.cc

r5725	r5735
33	33	#include "core/XMLPort.h"
34	34	#include "Pong.h"
35		#include "~~objects/~~infos/PlayerInfo.h"
	35	#include "infos/PlayerInfo.h"
36	36
37	37	namespace orxonox

code/branches/libraries2/src/modules/questsystem/QuestEffectBeacon.cc

r5727	r5735
37	37	#include "core/XMLPort.h"
38	38	#include "core/EventIncludes.h"
39		#include "~~objects/~~worldentities/pawns/Pawn.h"
	39	#include "worldentities/pawns/Pawn.h"
40	40	#include "interfaces/PlayerTrigger.h"
41	41	#include "QuestEffect.h"

code/branches/libraries2/src/modules/questsystem/QuestEffectBeacon.h

r5722	r5735
38	38
39	39	#include <list>
40		#include "~~objects/~~worldentities/StaticEntity.h"
	40	#include "worldentities/StaticEntity.h"
41	41
42	42	namespace orxonox

code/branches/libraries2/src/modules/questsystem/QuestManager.cc

r5693	r5735
38	38	#include "core/GUIManager.h"
39	39
40		#include "~~objects/~~infos/PlayerInfo.h"
	40	#include "infos/PlayerInfo.h"
41	41	#include "Quest.h"
42	42	#include "QuestHint.h"

code/branches/libraries2/src/modules/weapons/MuzzleFlash.h

r5724	r5735
33	33
34	34	#include "tools/Timer.h"
35		#include "~~objects/~~worldentities/Billboard.h"
	35	#include "worldentities/Billboard.h"
36	36
37	37	namespace orxonox

code/branches/libraries2/src/modules/weapons/munitions/FusionMunition.h

r5724	r5735
31	31
32	32	#include "weapons/WeaponsPrereqs.h"
33		#include "~~objects/~~weaponsystem/Munition.h"
	33	#include "weaponsystem/Munition.h"
34	34
35	35	namespace orxonox

code/branches/libraries2/src/modules/weapons/munitions/ReplenishingMunition.h

r5724	r5735
33	33
34	34	#include "tools/Timer.h"
35		#include "~~objects/~~weaponsystem/Munition.h"
	35	#include "weaponsystem/Munition.h"
36	36
37	37	namespace orxonox

code/branches/libraries2/src/modules/weapons/projectiles/BillboardProjectile.cc

-                      r3196
+                      r5735
 #include "core/CoreIncludes.h"
 #include "core/GameMode.h"
 #include "objects/Scene.h"
+#include "Scene.h"
 namespace orxonox
 …
         this->billboard_.setColour(colour);
+    }
     void BillboardProjectile::setMaterial(const std::string& material)
+    {

code/branches/libraries2/src/modules/weapons/projectiles/ParticleProjectile.cc

r3280	r5735
32	32	#include "tools/ParticleInterface.h"
33	33	#include "core/CoreIncludes.h"
34		#include "~~objects/~~Scene.h"
	34	#include "Scene.h"
35	35
36	36	namespace orxonox

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

-                      r3325
+                      r5735
 #include "core/GameMode.h"
 #include "objects/collisionshapes/SphereCollisionShape.h"
 #include "objects/worldentities/pawns/Pawn.h"
 #include "objects/worldentities/ParticleSpawner.h"
+#include "worldentities/pawns/Pawn.h"
+#include "worldentities/ParticleSpawner.h"
 namespace orxonox

code/branches/libraries2/src/modules/weapons/projectiles/Projectile.h

r5724	r5735
34	34	#include "tools/Timer.h"
35	35	#include "interfaces/PawnListener.h"
36		#include "~~objects/~~worldentities/MovableEntity.h"
	36	#include "worldentities/MovableEntity.h"
37	37
38	38	namespace orxonox

code/branches/libraries2/src/modules/weapons/weaponmodes/EnergyDrink.cc

-                      r5724
+                      r5735
 #include "core/Executor.h"
 #include "core/XMLPort.h"
 #include "objects/worldentities/Model.h"
+#include "worldentities/Model.h"
 #include "weapons/projectiles/Projectile.h"
 #include "weapons/MuzzleFlash.h"
 #include "objects/weaponsystem/Weapon.h"
 #include "objects/weaponsystem/WeaponPack.h"
 #include "objects/weaponsystem/WeaponSystem.h"
+#include "weaponsystem/Weapon.h"
+#include "weaponsystem/WeaponPack.h"
+#include "weaponsystem/WeaponSystem.h"
 namespace orxonox

code/branches/libraries2/src/modules/weapons/weaponmodes/EnergyDrink.h

r5724	r5735
34	34	#include <string>
35	35	#include "tools/Timer.h"
36		#include "~~objects/~~weaponsystem/WeaponMode.h"
	36	#include "weaponsystem/WeaponMode.h"
37	37
38	38	namespace orxonox

code/branches/libraries2/src/modules/weapons/weaponmodes/FusionFire.cc

-                      r5724
+                      r5735
 #include "weapons/projectiles/BillboardProjectile.h"
 #include "objects/weaponsystem/Weapon.h"
 #include "objects/weaponsystem/WeaponPack.h"
 #include "objects/weaponsystem/WeaponSystem.h"
+#include "weaponsystem/Weapon.h"
+#include "weaponsystem/WeaponPack.h"
+#include "weaponsystem/WeaponSystem.h"
 namespace orxonox

code/branches/libraries2/src/modules/weapons/weaponmodes/FusionFire.h

r5724	r5735
31	31
32	32	#include "weapons/WeaponsPrereqs.h"
33		#include "~~objects/~~weaponsystem/WeaponMode.h"
	33	#include "weaponsystem/WeaponMode.h"
34	34
35	35	namespace orxonox

code/branches/libraries2/src/modules/weapons/weaponmodes/HsW01.cc

-                      r5724
+                      r5735
 #include "core/Executor.h"
 #include "core/XMLPort.h"
 #include "objects/worldentities/Model.h"
+#include "worldentities/Model.h"
 #include "weapons/projectiles/Projectile.h"
 #include "weapons/MuzzleFlash.h"
 #include "objects/weaponsystem/Weapon.h"
 #include "objects/weaponsystem/WeaponPack.h"
 #include "objects/weaponsystem/WeaponSystem.h"
+#include "weaponsystem/Weapon.h"
+#include "weaponsystem/WeaponPack.h"
+#include "weaponsystem/WeaponSystem.h"
 namespace orxonox

code/branches/libraries2/src/modules/weapons/weaponmodes/HsW01.h

r5724	r5735
33	33
34	34	#include "tools/Timer.h"
35		#include "~~objects/~~weaponsystem/WeaponMode.h"
	35	#include "weaponsystem/WeaponMode.h"
36	36
37	37	namespace orxonox

code/branches/libraries2/src/modules/weapons/weaponmodes/LaserFire.cc

-                      r5724
+                      r5735
 #include "core/CoreIncludes.h"
 #include "weapons/projectiles/ParticleProjectile.h"
 #include "objects/weaponsystem/Weapon.h"
 #include "objects/weaponsystem/WeaponPack.h"
 #include "objects/weaponsystem/WeaponSystem.h"
+#include "weaponsystem/Weapon.h"
+#include "weaponsystem/WeaponPack.h"
+#include "weaponsystem/WeaponSystem.h"
 namespace orxonox

code/branches/libraries2/src/modules/weapons/weaponmodes/LaserFire.h

r5724	r5735
31	31
32	32	#include "weapons/WeaponsPrereqs.h"
33		#include "~~objects/~~weaponsystem/WeaponMode.h"
	33	#include "weaponsystem/WeaponMode.h"
34	34
35	35	namespace orxonox

code/branches/libraries2/src/modules/weapons/weaponmodes/LightningGun.cc

-                      r5724
+                      r5735
 #include "core/CoreIncludes.h"
 #include "weapons/projectiles/LightningGunProjectile.h"
 #include "objects/weaponsystem/Weapon.h"
 #include "objects/weaponsystem/WeaponPack.h"
 #include "objects/weaponsystem/WeaponSystem.h"
+#include "weaponsystem/Weapon.h"
+#include "weaponsystem/WeaponPack.h"
+#include "weaponsystem/WeaponSystem.h"
 namespace orxonox

code/branches/libraries2/src/modules/weapons/weaponmodes/LightningGun.h

r5724	r5735
31	31
32	32	#include "weapons/WeaponsPrereqs.h"
33		#include "~~objects/~~weaponsystem/WeaponMode.h"
	33	#include "weaponsystem/WeaponMode.h"
34	34
35	35	namespace orxonox

code/branches/libraries2/src/orxonox/CMakeLists.txt

-                      r5734
+                      r5735
   TOLUA_FILES
     LevelManager.h
     objects/pickup/BaseItem.h
     objects/pickup/PickupInventory.h
+    pickup/BaseItem.h
+    pickup/PickupInventory.h
   DEFINE_SYMBOL
     "ORXONOX_SHARED_BUILD"

code/branches/libraries2/src/orxonox/CameraManager.cc

-                      r3370
+                      r5735
 #include "core/ObjectList.h"
 #include "tools/Shader.h"
 #include "objects/worldentities/Camera.h"
 #include "objects/Scene.h"
+#include "worldentities/Camera.h"
+#include "Scene.h"
 namespace orxonox

code/branches/libraries2/src/orxonox/GlobalShader.cc

r5734	r5735
32	32	#include "core/CoreIncludes.h"
33	33	#include "core/XMLPort.h"
34		#include "~~objects/~~Scene.h"
	34	#include "Scene.h"
35	35
36	36	namespace orxonox

code/branches/libraries2/src/orxonox/Level.cc

-                      r5734
+                      r5735
 #include "core/XMLPort.h"
 #include "objects/infos/PlayerInfo.h"
 #include "objects/gametypes/Gametype.h"
+#include "infos/PlayerInfo.h"
+#include "gametypes/Gametype.h"
 #include "overlays/OverlayGroup.h"
 #include "sound/SoundBase.h"

code/branches/libraries2/src/orxonox/LevelManager.cc

-                      r5695
+                      r5735
 #include "core/Loader.h"
 #include "PlayerManager.h"
 #include "objects/Level.h"
 #include "objects/infos/HumanPlayer.h"
+#include "Level.h"
+#include "infos/HumanPlayer.h"
 namespace orxonox

code/branches/libraries2/src/orxonox/OrxonoxPrereqs.h

-                      r5730
+                      r5735
 namespace orxonox
+{
-    // manager
     class CameraManager;
     class LevelManager;
     class PawnManager;
     class PlayerManager;
+    class Level;
+    class Scene;
+    class Tickable;
     // interfaces
 …
     class Rewardable;
     class Teamcolourable;
-    // objects
-    class Level;
-    class Scene;
-    class Tickable;
     // worldentities

code/branches/libraries2/src/orxonox/PawnManager.cc

r3370	r5735
30	30
31	31	#include "core/CoreIncludes.h"
32		#include "~~objects/~~worldentities/pawns/Pawn.h"
	32	#include "worldentities/pawns/Pawn.h"
33	33
34	34	namespace orxonox

code/branches/libraries2/src/orxonox/PlayerManager.cc

-                      r3370
+                      r5735
 #include "core/CoreIncludes.h"
 #include "core/GameMode.h"
 #include "objects/Level.h"
 #include "objects/infos/HumanPlayer.h"
+#include "Level.h"
+#include "infos/HumanPlayer.h"
 #include "LevelManager.h"

code/branches/libraries2/src/orxonox/Scene.cc

r5734	r5735
44	44	#include "core/XMLPort.h"
45	45	#include "tools/BulletConversions.h"
46		#include "~~objects/~~worldentities/WorldEntity.h"
	46	#include "worldentities/WorldEntity.h"
47	47
48	48	namespace orxonox

code/branches/libraries2/src/orxonox/collisionshapes/CollisionShape.cc

r3325	r5735
33	33	#include "core/CoreIncludes.h"
34	34	#include "core/XMLPort.h"
35		#include "~~objects/~~worldentities/WorldEntity.h"
	35	#include "worldentities/WorldEntity.h"
36	36	#include "CompoundCollisionShape.h"
37	37	#include "WorldEntityCollisionShape.h"

code/branches/libraries2/src/orxonox/collisionshapes/WorldEntityCollisionShape.cc

r3196	r5735
33	33	#include "util/OrxAssert.h"
34	34	#include "core/CoreIncludes.h"
35		#include "~~objects/~~worldentities/WorldEntity.h"
	35	#include "worldentities/WorldEntity.h"
36	36
37	37	namespace orxonox

code/branches/libraries2/src/orxonox/controllers/AIController.cc

r3196	r5735
32	32	#include "core/CoreIncludes.h"
33	33	#include "core/Executor.h"
34		#include "~~objects/~~worldentities/ControllableEntity.h"
	34	#include "worldentities/ControllableEntity.h"
35	35
36	36	namespace orxonox

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

-                      r3325
+                      r5735
 #include "core/CoreIncludes.h"
 #include "objects/worldentities/ControllableEntity.h"
 #include "objects/worldentities/pawns/Pawn.h"
 #include "objects/worldentities/pawns/TeamBaseMatchBase.h"
 #include "objects/gametypes/TeamDeathmatch.h"
 #include "objects/controllers/WaypointPatrolController.h"
+#include "worldentities/ControllableEntity.h"
+#include "worldentities/pawns/Pawn.h"
+#include "worldentities/pawns/TeamBaseMatchBase.h"
+#include "gametypes/TeamDeathmatch.h"
+#include "controllers/WaypointPatrolController.h"
 namespace orxonox

code/branches/libraries2/src/orxonox/controllers/HumanController.cc

-                      r5734
+                      r5735
 #include "core/CoreIncludes.h"
 #include "core/ConsoleCommand.h"
 #include "objects/worldentities/ControllableEntity.h"
 #include "objects/worldentities/pawns/Pawn.h"
 #include "objects/gametypes/Gametype.h"
 #include "objects/infos/PlayerInfo.h"
+#include "worldentities/ControllableEntity.h"
+#include "worldentities/pawns/Pawn.h"
+#include "gametypes/Gametype.h"
+#include "infos/PlayerInfo.h"
 #include "overlays/Map.h"

code/branches/libraries2/src/orxonox/controllers/WaypointController.cc

r3196	r5735
31	31	#include "core/CoreIncludes.h"
32	32	#include "core/XMLPort.h"
33		#include "~~objects/~~worldentities/ControllableEntity.h"
	33	#include "worldentities/ControllableEntity.h"
34	34
35	35	namespace orxonox

code/branches/libraries2/src/orxonox/controllers/WaypointPatrolController.cc

r3301	r5735
32	32	#include "core/CoreIncludes.h"
33	33	#include "core/XMLPort.h"
34		#include "~~objects/~~worldentities/pawns/Pawn.h"
	34	#include "worldentities/pawns/Pawn.h"
35	35
36	36	namespace orxonox

code/branches/libraries2/src/orxonox/gametypes/Asteroids.cc

r3196	r5735
31	31	#include "core/CoreIncludes.h"
32	32	#include "network/Host.h"
33		#include "~~objects/~~worldentities/pawns/Pawn.h"
	33	#include "worldentities/pawns/Pawn.h"
34	34
35	35	namespace orxonox

code/branches/libraries2/src/orxonox/gametypes/Deathmatch.cc

-                      r3196
+                      r5735
 #include "core/CoreIncludes.h"
 #include "network/Host.h"
 #include "objects/infos/PlayerInfo.h"
 #include "objects/worldentities/pawns/Pawn.h"
+#include "infos/PlayerInfo.h"
+#include "worldentities/pawns/Pawn.h"
 namespace orxonox

code/branches/libraries2/src/orxonox/gametypes/Gametype.cc

-                      r3196
+                      r5735
 #include "core/GameMode.h"
 #include "objects/infos/PlayerInfo.h"
 #include "objects/infos/Bot.h"
 #include "objects/worldentities/Camera.h"
 #include "objects/worldentities/ControllableEntity.h"
 #include "objects/worldentities/SpawnPoint.h"
 #include "objects/worldentities/pawns/Spectator.h"
 #include "objects/worldentities/pawns/Pawn.h"
+#include "infos/PlayerInfo.h"
+#include "infos/Bot.h"
+#include "worldentities/Camera.h"
+#include "worldentities/ControllableEntity.h"
+#include "worldentities/SpawnPoint.h"
+#include "worldentities/pawns/Spectator.h"
+#include "worldentities/pawns/Pawn.h"
 #include "overlays/OverlayGroup.h"

code/branches/libraries2/src/orxonox/gametypes/Gametype.h

r5693	r5735
39	39	#include "core/Identifier.h"
40	40	#include "tools/interfaces/Tickable.h"
41		#include "~~objects/~~infos/GametypeInfo.h"
	41	#include "infos/GametypeInfo.h"
42	42
43	43	namespace orxonox

code/branches/libraries2/src/orxonox/gametypes/TeamBaseMatch.cc

-                      r3325
+                      r5735
 #include "core/CoreIncludes.h"
 #include "core/Executor.h"
 #include "objects/worldentities/pawns/TeamBaseMatchBase.h"
 #include "objects/infos/PlayerInfo.h"
+#include "worldentities/pawns/TeamBaseMatchBase.h"
+#include "infos/PlayerInfo.h"
 namespace orxonox

code/branches/libraries2/src/orxonox/gametypes/TeamDeathmatch.cc

-                      r3325
+                      r5735
 #include "core/ConfigValueIncludes.h"
 #include "interfaces/TeamColourable.h"
 #include "objects/worldentities/TeamSpawnPoint.h"
 #include "objects/worldentities/pawns/Pawn.h"
+#include "worldentities/TeamSpawnPoint.h"
+#include "worldentities/pawns/Pawn.h"
 namespace orxonox

code/branches/libraries2/src/orxonox/gametypes/UnderAttack.cc

-                      r3301
+                      r5735
 #include "core/ConfigValueIncludes.h"
 #include "network/Host.h"
 #include "objects/worldentities/pawns/Destroyer.h"
 #include "objects/infos/PlayerInfo.h"
+#include "worldentities/pawns/Destroyer.h"
+#include "infos/PlayerInfo.h"
 namespace orxonox

code/branches/libraries2/src/orxonox/infos/Bot.cc

-                      r3300
+                      r5735
 #include "core/CoreIncludes.h"
 #include "core/ConfigValueIncludes.h"
 #include "objects/gametypes/Gametype.h"
 #include "objects/controllers/AIController.h"
+#include "gametypes/Gametype.h"
+#include "controllers/AIController.h"
 namespace orxonox

code/branches/libraries2/src/orxonox/infos/HumanPlayer.cc

-                      r3280
+                      r5735
 #include "network/ClientInformation.h"
 #include "network/Host.h"
 #include "objects/controllers/HumanController.h"
 #include "objects/gametypes/Gametype.h"
+#include "controllers/HumanController.h"
+#include "gametypes/Gametype.h"
 #include "overlays/OverlayGroup.h"

code/branches/libraries2/src/orxonox/infos/PlayerInfo.cc

-                      r3325
+                      r5735
 #include "core/CoreIncludes.h"
 #include "network/ClientInformation.h"
 #include "objects/gametypes/Gametype.h"
 #include "objects/worldentities/ControllableEntity.h"
+#include "gametypes/Gametype.h"
+#include "worldentities/ControllableEntity.h"
 namespace orxonox

code/branches/libraries2/src/orxonox/infos/PlayerInfo.h

r3038	r5735
34	34	#include "Info.h"
35	35	#include "core/Identifier.h"
36		#include "~~objects/~~controllers/Controller.h"
	36	#include "controllers/Controller.h"
37	37
38	38	namespace orxonox

code/branches/libraries2/src/orxonox/interfaces/RadarViewable.cc

-                      r5732
+                      r5735
 #include "core/CoreIncludes.h"
 #include "tools/DynamicLines.h"
 #include "objects/worldentities/WorldEntity.h"
 #include "objects/Radar.h"
+#include "worldentities/WorldEntity.h"
+#include "Radar.h"
 #include "overlays/Map.h"

code/branches/libraries2/src/orxonox/items/Engine.cc

-                      r3325
+                      r5735
 #include "core/ConfigValueIncludes.h"
 #include "core/XMLPort.h"
 #include "objects/Scene.h"
 #include "objects/worldentities/pawns/SpaceShip.h"
 #include "objects/pickup/ModifierType.h"
+#include "Scene.h"
+#include "worldentities/pawns/SpaceShip.h"
+#include "pickup/ModifierType.h"
 #include "tools/Shader.h"
 #include "sound/SoundBase.h"

code/branches/libraries2/src/orxonox/items/MultiStateEngine.cc

r3280	r5735
32	32	#include "core/GameMode.h"
33	33	#include "core/XMLPort.h"
34		#include "~~objects/~~worldentities/pawns/SpaceShip.h"
	34	#include "worldentities/pawns/SpaceShip.h"
35	35
36	36	namespace orxonox

code/branches/libraries2/src/orxonox/overlays/Map.cc

-                      r5732
+                      r5735
 #include "core/XMLPort.h"
 #include "interfaces/RadarViewable.h"
 #include "objects/Scene.h"
 #include "objects/controllers/HumanController.h"
 #include "objects/worldentities/CameraPosition.h"
 #include "objects/worldentities/ControllableEntity.h"
+#include "Scene.h"
+#include "controllers/HumanController.h"
+#include "worldentities/CameraPosition.h"
+#include "worldentities/ControllableEntity.h"
  namespace orxonox

code/branches/libraries2/src/orxonox/pickup/BaseItem.cc

r3196	r5735
36	36	#include "core/CoreIncludes.h"
37	37	#include "core/XMLPort.h"
38		#include "~~objects/~~worldentities/pawns/Pawn.h"
	38	#include "worldentities/pawns/Pawn.h"
39	39
40	40	namespace orxonox

code/branches/libraries2/src/orxonox/pickup/DroppedItem.cc

-                      r3196
+                      r5735
 #include "core/Executor.h"
 #include "BaseItem.h"
 #include "objects/worldentities/Billboard.h"
 #include "objects/worldentities/Model.h"
 #include "objects/worldentities/pawns/Pawn.h"
+#include "worldentities/Billboard.h"
+#include "worldentities/Model.h"
+#include "worldentities/pawns/Pawn.h"
 namespace orxonox

code/branches/libraries2/src/orxonox/pickup/DroppedItem.h

r5693	r5735
39	39	#include "tools/Timer.h"
40	40	#include "tools/interfaces/Tickable.h"
41		#include "~~objects/~~worldentities/StaticEntity.h"
	41	#include "worldentities/StaticEntity.h"
42	42
43	43	namespace orxonox

code/branches/libraries2/src/orxonox/pickup/ModifierPickup.cc

r3280	r5735
36	36	#include "core/CoreIncludes.h"
37	37	#include "core/XMLPort.h"
38		#include "~~objects/~~worldentities/pawns/Pawn.h"
	38	#include "worldentities/pawns/Pawn.h"
39	39
40	40	namespace orxonox

code/branches/libraries2/src/orxonox/pickup/PickupInventory.cc

-                      r3370
+                      r5735
 #include "core/GUIManager.h"
 #include "core/input/InputManager.h"
 #include "objects/controllers/HumanController.h"
 #include "objects/worldentities/pawns/Pawn.h"
+#include "controllers/HumanController.h"
+#include "worldentities/pawns/Pawn.h"
 #include "EquipmentItem.h"

code/branches/libraries2/src/orxonox/pickup/PickupSpawner.cc

r3370	r5735
40	40	#include "core/Template.h"
41	41	#include "core/XMLPort.h"
42		#include "~~objects/~~worldentities/pawns/Pawn.h"
	42	#include "worldentities/pawns/Pawn.h"
43	43	#include "PickupInventory.h" // HACK; Only for hack, remove later
44	44

code/branches/libraries2/src/orxonox/pickup/PickupSpawner.h

r5693	r5735
40	40	#include "tools/Timer.h"
41	41	#include "tools/interfaces/Tickable.h"
42		#include "~~objects/~~worldentities/StaticEntity.h"
	42	#include "worldentities/StaticEntity.h"
43	43
44	44	namespace orxonox

code/branches/libraries2/src/orxonox/pickup/items/HealthImmediate.cc

r3196	r5735
36	36	#include "core/CoreIncludes.h"
37	37	#include "core/XMLPort.h"
38		#include "~~objects/~~worldentities/pawns/Pawn.h"
	38	#include "worldentities/pawns/Pawn.h"
39	39
40	40	namespace orxonox

code/branches/libraries2/src/orxonox/pickup/items/HealthImmediate.h

r3196	r5735
36	36
37	37	#include "OrxonoxPrereqs.h"
38		#include "~~objects/~~pickup/PassiveItem.h"
	38	#include "pickup/PassiveItem.h"
39	39
40	40	namespace orxonox

code/branches/libraries2/src/orxonox/pickup/items/HealthUsable.cc

-                      r3196
+                      r5735
 #include "core/CoreIncludes.h"
 #include "core/XMLPort.h"
 #include "objects/pickup/DroppedItem.h"
 #include "objects/worldentities/pawns/Pawn.h"
+#include "pickup/DroppedItem.h"
+#include "worldentities/pawns/Pawn.h"
 namespace orxonox

code/branches/libraries2/src/orxonox/pickup/items/HealthUsable.h

r3196	r5735
38	38
39	39	#include <climits>
40		#include "~~objects/~~pickup/UsableItem.h"
	40	#include "pickup/UsableItem.h"
41	41
42	42	namespace orxonox

code/branches/libraries2/src/orxonox/pickup/items/Jump.cc

-                      r3196
+                      r5735
 #include "core/CoreIncludes.h"
 #include "core/XMLPort.h"
 #include "objects/pickup/DroppedItem.h"
 #include "objects/worldentities/pawns/Pawn.h"
+#include "pickup/DroppedItem.h"
+#include "worldentities/pawns/Pawn.h"
 namespace orxonox

code/branches/libraries2/src/orxonox/pickup/items/Jump.h

r3196	r5735
41	41	#include <climits>
42	42	#include "util/Math.h"
43		#include "~~objects/~~pickup/UsableItem.h"
	43	#include "pickup/UsableItem.h"
44	44
45	45	namespace orxonox

code/branches/libraries2/src/orxonox/sound/SoundBase.cc

r5720	r5735
37	37	#include "core/Core.h"
38	38	#include "core/Resource.h"
39		#include "~~objects/~~worldentities/WorldEntity.h"
	39	#include "worldentities/WorldEntity.h"
40	40	#include "SoundManager.h"
41	41

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

r5720	r5735
33	33	#include "util/Math.h"
34	34	#include "CameraManager.h"
35		#include "~~objects/~~worldentities/Camera.h"
	35	#include "worldentities/Camera.h"
36	36	#include "SoundBase.h"
37	37

code/branches/libraries2/src/orxonox/weaponsystem/Weapon.h

r3196	r5735
35	35	#include <map>
36	36	#include "tools/Timer.h"
37		#include "~~objects/~~worldentities/StaticEntity.h"
	37	#include "worldentities/StaticEntity.h"
38	38
39	39	namespace orxonox

code/branches/libraries2/src/orxonox/weaponsystem/WeaponSlot.h

r3053	r5735
31	31
32	32	#include "OrxonoxPrereqs.h"
33		#include "~~objects/~~worldentities/StaticEntity.h"
	33	#include "worldentities/StaticEntity.h"
34	34
35	35	namespace orxonox

code/branches/libraries2/src/orxonox/weaponsystem/WeaponSystem.cc

r3110	r5735
30	30
31	31	#include "core/CoreIncludes.h"
32		#include "~~objects/~~worldentities/pawns/Pawn.h"
	32	#include "worldentities/pawns/Pawn.h"
33	33
34	34	#include "WeaponSlot.h"

code/branches/libraries2/src/orxonox/worldentities/Backlight.cc

r3280	r5735
38	38	#include "core/GameMode.h"
39	39	#include "core/XMLPort.h"
40		#include "~~objects/~~Scene.h"
	40	#include "Scene.h"
41	41
42	42	namespace orxonox

code/branches/libraries2/src/orxonox/worldentities/BigExplosion.cc

-                      r3325
+                      r5735
 #include "core/GameMode.h"
 #include "tools/ParticleInterface.h"
 #include "objects/Scene.h"
 #include "objects/worldentities/ParticleSpawner.h"
+#include "Scene.h"
+#include "worldentities/ParticleSpawner.h"
 #include "Model.h"

code/branches/libraries2/src/orxonox/worldentities/Billboard.cc

-                      r3280
+                      r5735
 #include "core/GameMode.h"
 #include "core/XMLPort.h"
 #include "objects/Scene.h"
+#include "Scene.h"
 namespace orxonox
 …
             this->billboard_.setColour(this->colour_);
+    }
 /*
     void Billboard::changedRotation()

code/branches/libraries2/src/orxonox/worldentities/Camera.cc

r3280	r5735
38	38	#include "core/CoreIncludes.h"
39	39	#include "core/ConfigValueIncludes.h"
40		#include "~~objects/~~Scene.h"
	40	#include "Scene.h"
41	41	#include "CameraManager.h"
42	42

code/branches/libraries2/src/orxonox/worldentities/Camera.h

r5693	r5735
34	34	#include "util/OgreForwardRefs.h"
35	35	#include "tools/interfaces/Tickable.h"
36		#include "~~objects/~~worldentities/StaticEntity.h"
	36	#include "worldentities/StaticEntity.h"
37	37
38	38	namespace orxonox

code/branches/libraries2/src/orxonox/worldentities/CameraPosition.h

r3196	r5735
31	31
32	32	#include "OrxonoxPrereqs.h"
33		#include "~~objects/~~worldentities/StaticEntity.h"
	33	#include "worldentities/StaticEntity.h"
34	34
35	35	namespace orxonox

code/branches/libraries2/src/orxonox/worldentities/ControllableEntity.cc

-                      r3325
+                      r5735
 #include "core/XMLPort.h"
 #include "objects/Scene.h"
 #include "objects/infos/PlayerInfo.h"
 #include "objects/controllers/Controller.h"
 #include "objects/worldentities/Camera.h"
 #include "objects/worldentities/CameraPosition.h"
+#include "Scene.h"
+#include "infos/PlayerInfo.h"
+#include "controllers/Controller.h"
+#include "worldentities/Camera.h"
+#include "worldentities/CameraPosition.h"
 #include "overlays/OverlayGroup.h"
 …
         registerVariable(this->client_orientation_,      VariableDirection::ToServer, new NetworkCallback<ControllableEntity>(this, &ControllableEntity::processClientOrientation));
         registerVariable(this->client_angular_velocity_, VariableDirection::ToServer, new NetworkCallback<ControllableEntity>(this, &ControllableEntity::processClientAngularVelocity));
         registerVariable(this->playerID_,                VariableDirection::ToClient, new NetworkCallback<ControllableEntity>(this, &ControllableEntity::networkcallback_changedplayerID));

code/branches/libraries2/src/orxonox/worldentities/ExplosionChunk.cc

r3280	r5735
33	33	#include "core/GameMode.h"
34	34	#include "util/Exception.h"
35		#include "~~objects/~~Scene.h"
	35	#include "Scene.h"
36	36	#include "tools/ParticleInterface.h"
37	37

code/branches/libraries2/src/orxonox/worldentities/Light.cc

r3280	r5735
38	38	#include "core/GameMode.h"
39	39	#include "core/XMLPort.h"
40		#include "~~objects/~~Scene.h"
	40	#include "Scene.h"
41	41
42	42	namespace orxonox

code/branches/libraries2/src/orxonox/worldentities/MobileEntity.cc

r3196	r5735
34	34	#include "core/CoreIncludes.h"
35	35	#include "core/XMLPort.h"
36		#include "~~objects/~~Scene.h"
	36	#include "Scene.h"
37	37
38	38	namespace orxonox

code/branches/libraries2/src/orxonox/worldentities/Model.cc

r3280	r5735
34	34	#include "core/GameMode.h"
35	35	#include "core/XMLPort.h"
36		#include "~~objects/~~Scene.h"
	36	#include "Scene.h"
37	37
38	38	namespace orxonox

code/branches/libraries2/src/orxonox/worldentities/MovableEntity.cc

r3325	r5735
34	34	#include "core/GameMode.h"
35	35	#include "core/XMLPort.h"
36		#include "~~objects/~~worldentities/pawns/Pawn.h"
	36	#include "worldentities/pawns/Pawn.h"
37	37
38	38	namespace orxonox

code/branches/libraries2/src/orxonox/worldentities/ParticleEmitter.cc

r3280	r5735
39	39	#include "core/XMLPort.h"
40	40	#include "tools/ParticleInterface.h"
41		#include "~~objects/~~Scene.h"
	41	#include "Scene.h"
42	42
43	43	namespace orxonox

code/branches/libraries2/src/orxonox/worldentities/SpawnPoint.cc

-                      r3196
+                      r5735
 #include "core/Template.h"
 #include "core/XMLPort.h"
 #include "objects/gametypes/Gametype.h"
 #include "objects/worldentities/pawns/Pawn.h"
+#include "gametypes/Gametype.h"
+#include "worldentities/pawns/Pawn.h"
 namespace orxonox

code/branches/libraries2/src/orxonox/worldentities/SpawnPoint.h

r3196	r5735
34	34	#include <string>
35	35	#include "core/Identifier.h"
36		#include "~~objects/~~worldentities/StaticEntity.h"
	36	#include "worldentities/StaticEntity.h"
37	37
38	38	namespace orxonox

code/branches/libraries2/src/orxonox/worldentities/TeamSpawnPoint.h

r3196	r5735
32	32	#include "OrxonoxPrereqs.h"
33	33
34		#include "~~objects/~~worldentities/pawns/Pawn.h"
	34	#include "worldentities/pawns/Pawn.h"
35	35	#include "SpawnPoint.h"
36	36

code/branches/libraries2/src/orxonox/worldentities/WorldEntity.cc

-                      r3325
+                      r5735
 #include "core/CoreIncludes.h"
 #include "core/XMLPort.h"
 #include "objects/Scene.h"
 #include "objects/collisionshapes/WorldEntityCollisionShape.h"
+#include "Scene.h"
+#include "collisionshapes/WorldEntityCollisionShape.h"
 namespace orxonox

code/branches/libraries2/src/orxonox/worldentities/pawns/Destroyer.cc

r3325	r5735
30	30
31	31	#include "core/CoreIncludes.h"
32		#include "~~objects/~~gametypes/UnderAttack.h"
	32	#include "gametypes/UnderAttack.h"
33	33
34	34	namespace orxonox

code/branches/libraries2/src/orxonox/worldentities/pawns/Pawn.cc

-                      r3300
+                      r5735
 #include "interfaces/PawnListener.h"
 #include "PawnManager.h"
 #include "objects/infos/PlayerInfo.h"
 #include "objects/gametypes/Gametype.h"
 #include "objects/worldentities/ParticleSpawner.h"
 #include "objects/worldentities/ExplosionChunk.h"
 #include "objects/worldentities/BigExplosion.h"
 #include "objects/weaponsystem/WeaponSystem.h"
 #include "objects/weaponsystem/WeaponSlot.h"
 #include "objects/weaponsystem/WeaponPack.h"
 #include "objects/weaponsystem/WeaponSet.h"
+#include "infos/PlayerInfo.h"
+#include "gametypes/Gametype.h"
+#include "worldentities/ParticleSpawner.h"
+#include "worldentities/ExplosionChunk.h"
+#include "worldentities/BigExplosion.h"
+#include "weaponsystem/WeaponSystem.h"
+#include "weaponsystem/WeaponSlot.h"
+#include "weaponsystem/WeaponPack.h"
+#include "weaponsystem/WeaponSet.h"

code/branches/libraries2/src/orxonox/worldentities/pawns/Pawn.h

-                      r3214
+                      r5735
 #include <string>
 #include "interfaces/RadarViewable.h"
 #include "objects/worldentities/ControllableEntity.h"
 #include "objects/pickup/PickupCollection.h"
+#include "worldentities/ControllableEntity.h"
+#include "pickup/PickupCollection.h"
 namespace orxonox
 …
             virtual void useItem()
                 { this->pickups_.useItem(); }
             virtual void startLocalHumanControl();

code/branches/libraries2/src/orxonox/worldentities/pawns/SpaceShip.cc

r3325	r5735
35	35	#include "core/Template.h"
36	36	#include "core/XMLPort.h"
37		#include "~~objects/~~items/Engine.h"
	37	#include "items/Engine.h"
38	38
39	39	namespace orxonox

code/branches/libraries2/src/orxonox/worldentities/pawns/Spectator.cc

-                      r3280
+                      r5735
 #include "tools/BillboardSet.h"
 #include "objects/Scene.h"
 #include "objects/infos/PlayerInfo.h"
+#include "Scene.h"
+#include "infos/PlayerInfo.h"
 namespace orxonox

code/branches/libraries2/src/orxonox/worldentities/pawns/Spectator.h

r3196	r5735
33	33
34	34	#include "util/Math.h"
35		#include "~~objects/~~worldentities/ControllableEntity.h"
	35	#include "worldentities/ControllableEntity.h"
36	36
37	37	namespace orxonox

code/branches/libraries2/src/orxonox/worldentities/pawns/TeamBaseMatchBase.cc

r3325	r5735
33	33	#include "interfaces/PawnListener.h"
34	34	#include "interfaces/TeamColourable.h"
35		#include "~~objects/~~gametypes/TeamBaseMatch.h"
	35	#include "gametypes/TeamBaseMatch.h"
36	36
37	37	namespace orxonox

Note: See TracChangeset for help on using the changeset viewer.

Context Navigation

Changeset 5735 for code/branches

Legend:

Download in other formats: