Context Navigation

← Previous Change
Next Change →

modules

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/modules

Files:

: 58 edited

gamestates/GSLevel.cc (modified) (1 diff)
gamestates/GSMainMenu.cc (modified) (1 diff)
objects/Attacher.h (modified) (1 diff)
objects/ForceField.cc (modified) (2 diffs)
objects/ForceField.h (modified) (1 diff)
objects/Planet.cc (modified) (1 diff)
objects/Planet.h (modified) (1 diff)
objects/collisionshapes/BoxCollisionShape.h (modified) (1 diff)
objects/collisionshapes/ConeCollisionShape.h (modified) (1 diff)
objects/collisionshapes/PlaneCollisionShape.h (modified) (1 diff)
objects/collisionshapes/SphereCollisionShape.h (modified) (1 diff)
objects/triggers/CheckPoint.cc (modified) (1 diff)
objects/triggers/DistanceTrigger.cc (modified) (1 diff)
objects/triggers/Trigger.cc (modified) (1 diff)
objects/triggers/Trigger.h (modified) (1 diff)
overlays/GUIOverlay.cc (modified) (1 diff)
overlays/hud/AnnounceMessage.cc (modified) (1 diff)
overlays/hud/ChatOverlay.cc (modified) (1 diff)
overlays/hud/DeathMessage.cc (modified) (1 diff)
overlays/hud/GametypeStatus.cc (modified) (1 diff)
overlays/hud/HUDHealthBar.cc (modified) (1 diff)
overlays/hud/HUDNavigation.cc (modified) (1 diff)
overlays/hud/HUDRadar.cc (modified) (1 diff)
overlays/hud/HUDSpeedBar.cc (modified) (1 diff)
overlays/hud/HUDTimer.cc (modified) (1 diff)
overlays/hud/KillMessage.cc (modified) (1 diff)
overlays/hud/TeamBaseMatchScore.cc (modified) (1 diff)
overlays/hud/UnderAttackHealthBar.cc (modified) (1 diff)
overlays/stats/Scoreboard.cc (modified) (1 diff)
pong/Pong.h (modified) (1 diff)
pong/PongAI.cc (modified) (1 diff)
pong/PongAI.h (modified) (1 diff)
pong/PongBall.cc (modified) (1 diff)
pong/PongBall.h (modified) (1 diff)
pong/PongBat.h (modified) (1 diff)
pong/PongBot.h (modified) (1 diff)
pong/PongCenterpoint.h (modified) (1 diff)
pong/PongScore.cc (modified) (1 diff)
questsystem/QuestEffectBeacon.cc (modified) (1 diff)
questsystem/QuestEffectBeacon.h (modified) (1 diff)
questsystem/QuestManager.cc (modified) (1 diff)
weapons/MuzzleFlash.h (modified) (1 diff)
weapons/munitions/FusionMunition.h (modified) (1 diff)
weapons/munitions/ReplenishingMunition.h (modified) (1 diff)
weapons/projectiles/BillboardProjectile.cc (modified) (2 diffs)
weapons/projectiles/ParticleProjectile.cc (modified) (1 diff)
weapons/projectiles/Projectile.cc (modified) (1 diff)
weapons/projectiles/Projectile.h (modified) (1 diff)
weapons/weaponmodes/EnergyDrink.cc (modified) (1 diff)
weapons/weaponmodes/EnergyDrink.h (modified) (1 diff)
weapons/weaponmodes/FusionFire.cc (modified) (1 diff)
weapons/weaponmodes/FusionFire.h (modified) (1 diff)
weapons/weaponmodes/HsW01.cc (modified) (1 diff)
weapons/weaponmodes/HsW01.h (modified) (1 diff)
weapons/weaponmodes/LaserFire.cc (modified) (1 diff)
weapons/weaponmodes/LaserFire.h (modified) (1 diff)
weapons/weaponmodes/LightningGun.cc (modified) (1 diff)
weapons/weaponmodes/LightningGun.h (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

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

Context Navigation

Changeset 5735 for code/branches/libraries2/src/modules

Legend:

Download in other formats: