[Orxonox-commit 1014] r5735 - in code/branches/libraries2/src: modules/gamestates modules/objects modules/objects/collisionshapes modules/objects/triggers modules/overlays modules/overlays/hud modules/overlays/stats modules/pong modules/questsystem modules/weapons modules/weapons/munitions modules/weapons/projectiles modules/weapons/weaponmodes orxonox orxonox/collisionshapes orxonox/controllers orxonox/gametypes orxonox/infos orxonox/interfaces orxonox/items orxonox/overlays orxonox/pickup orxonox/pickup/items orxonox/sound orxonox/weaponsystem orxonox/worldentities orxonox/worldentities/pawns
landauf at orxonox.net
landauf at orxonox.net
Tue Sep 1 00:38:37 CEST 2009
Author: landauf
Date: 2009-09-01 00:38:36 +0200 (Tue, 01 Sep 2009)
New Revision: 5735
Modified:
code/branches/libraries2/src/modules/gamestates/GSLevel.cc
code/branches/libraries2/src/modules/gamestates/GSMainMenu.cc
code/branches/libraries2/src/modules/objects/Attacher.h
code/branches/libraries2/src/modules/objects/ForceField.cc
code/branches/libraries2/src/modules/objects/ForceField.h
code/branches/libraries2/src/modules/objects/Planet.cc
code/branches/libraries2/src/modules/objects/Planet.h
code/branches/libraries2/src/modules/objects/collisionshapes/BoxCollisionShape.h
code/branches/libraries2/src/modules/objects/collisionshapes/ConeCollisionShape.h
code/branches/libraries2/src/modules/objects/collisionshapes/PlaneCollisionShape.h
code/branches/libraries2/src/modules/objects/collisionshapes/SphereCollisionShape.h
code/branches/libraries2/src/modules/objects/triggers/CheckPoint.cc
code/branches/libraries2/src/modules/objects/triggers/DistanceTrigger.cc
code/branches/libraries2/src/modules/objects/triggers/Trigger.cc
code/branches/libraries2/src/modules/objects/triggers/Trigger.h
code/branches/libraries2/src/modules/overlays/GUIOverlay.cc
code/branches/libraries2/src/modules/overlays/hud/AnnounceMessage.cc
code/branches/libraries2/src/modules/overlays/hud/ChatOverlay.cc
code/branches/libraries2/src/modules/overlays/hud/DeathMessage.cc
code/branches/libraries2/src/modules/overlays/hud/GametypeStatus.cc
code/branches/libraries2/src/modules/overlays/hud/HUDHealthBar.cc
code/branches/libraries2/src/modules/overlays/hud/HUDNavigation.cc
code/branches/libraries2/src/modules/overlays/hud/HUDRadar.cc
code/branches/libraries2/src/modules/overlays/hud/HUDSpeedBar.cc
code/branches/libraries2/src/modules/overlays/hud/HUDTimer.cc
code/branches/libraries2/src/modules/overlays/hud/KillMessage.cc
code/branches/libraries2/src/modules/overlays/hud/TeamBaseMatchScore.cc
code/branches/libraries2/src/modules/overlays/hud/UnderAttackHealthBar.cc
code/branches/libraries2/src/modules/overlays/stats/Scoreboard.cc
code/branches/libraries2/src/modules/pong/Pong.h
code/branches/libraries2/src/modules/pong/PongAI.cc
code/branches/libraries2/src/modules/pong/PongAI.h
code/branches/libraries2/src/modules/pong/PongBall.cc
code/branches/libraries2/src/modules/pong/PongBall.h
code/branches/libraries2/src/modules/pong/PongBat.h
code/branches/libraries2/src/modules/pong/PongBot.h
code/branches/libraries2/src/modules/pong/PongCenterpoint.h
code/branches/libraries2/src/modules/pong/PongScore.cc
code/branches/libraries2/src/modules/questsystem/QuestEffectBeacon.cc
code/branches/libraries2/src/modules/questsystem/QuestEffectBeacon.h
code/branches/libraries2/src/modules/questsystem/QuestManager.cc
code/branches/libraries2/src/modules/weapons/MuzzleFlash.h
code/branches/libraries2/src/modules/weapons/munitions/FusionMunition.h
code/branches/libraries2/src/modules/weapons/munitions/ReplenishingMunition.h
code/branches/libraries2/src/modules/weapons/projectiles/BillboardProjectile.cc
code/branches/libraries2/src/modules/weapons/projectiles/ParticleProjectile.cc
code/branches/libraries2/src/modules/weapons/projectiles/Projectile.cc
code/branches/libraries2/src/modules/weapons/projectiles/Projectile.h
code/branches/libraries2/src/modules/weapons/weaponmodes/EnergyDrink.cc
code/branches/libraries2/src/modules/weapons/weaponmodes/EnergyDrink.h
code/branches/libraries2/src/modules/weapons/weaponmodes/FusionFire.cc
code/branches/libraries2/src/modules/weapons/weaponmodes/FusionFire.h
code/branches/libraries2/src/modules/weapons/weaponmodes/HsW01.cc
code/branches/libraries2/src/modules/weapons/weaponmodes/HsW01.h
code/branches/libraries2/src/modules/weapons/weaponmodes/LaserFire.cc
code/branches/libraries2/src/modules/weapons/weaponmodes/LaserFire.h
code/branches/libraries2/src/modules/weapons/weaponmodes/LightningGun.cc
code/branches/libraries2/src/modules/weapons/weaponmodes/LightningGun.h
code/branches/libraries2/src/orxonox/CMakeLists.txt
code/branches/libraries2/src/orxonox/CameraManager.cc
code/branches/libraries2/src/orxonox/GlobalShader.cc
code/branches/libraries2/src/orxonox/Level.cc
code/branches/libraries2/src/orxonox/LevelManager.cc
code/branches/libraries2/src/orxonox/OrxonoxPrereqs.h
code/branches/libraries2/src/orxonox/PawnManager.cc
code/branches/libraries2/src/orxonox/PlayerManager.cc
code/branches/libraries2/src/orxonox/Scene.cc
code/branches/libraries2/src/orxonox/collisionshapes/CollisionShape.cc
code/branches/libraries2/src/orxonox/collisionshapes/WorldEntityCollisionShape.cc
code/branches/libraries2/src/orxonox/controllers/AIController.cc
code/branches/libraries2/src/orxonox/controllers/ArtificialController.cc
code/branches/libraries2/src/orxonox/controllers/HumanController.cc
code/branches/libraries2/src/orxonox/controllers/WaypointController.cc
code/branches/libraries2/src/orxonox/controllers/WaypointPatrolController.cc
code/branches/libraries2/src/orxonox/gametypes/Asteroids.cc
code/branches/libraries2/src/orxonox/gametypes/Deathmatch.cc
code/branches/libraries2/src/orxonox/gametypes/Gametype.cc
code/branches/libraries2/src/orxonox/gametypes/Gametype.h
code/branches/libraries2/src/orxonox/gametypes/TeamBaseMatch.cc
code/branches/libraries2/src/orxonox/gametypes/TeamDeathmatch.cc
code/branches/libraries2/src/orxonox/gametypes/UnderAttack.cc
code/branches/libraries2/src/orxonox/infos/Bot.cc
code/branches/libraries2/src/orxonox/infos/HumanPlayer.cc
code/branches/libraries2/src/orxonox/infos/PlayerInfo.cc
code/branches/libraries2/src/orxonox/infos/PlayerInfo.h
code/branches/libraries2/src/orxonox/interfaces/RadarViewable.cc
code/branches/libraries2/src/orxonox/items/Engine.cc
code/branches/libraries2/src/orxonox/items/MultiStateEngine.cc
code/branches/libraries2/src/orxonox/overlays/Map.cc
code/branches/libraries2/src/orxonox/pickup/BaseItem.cc
code/branches/libraries2/src/orxonox/pickup/DroppedItem.cc
code/branches/libraries2/src/orxonox/pickup/DroppedItem.h
code/branches/libraries2/src/orxonox/pickup/ModifierPickup.cc
code/branches/libraries2/src/orxonox/pickup/PickupInventory.cc
code/branches/libraries2/src/orxonox/pickup/PickupSpawner.cc
code/branches/libraries2/src/orxonox/pickup/PickupSpawner.h
code/branches/libraries2/src/orxonox/pickup/items/HealthImmediate.cc
code/branches/libraries2/src/orxonox/pickup/items/HealthImmediate.h
code/branches/libraries2/src/orxonox/pickup/items/HealthUsable.cc
code/branches/libraries2/src/orxonox/pickup/items/HealthUsable.h
code/branches/libraries2/src/orxonox/pickup/items/Jump.cc
code/branches/libraries2/src/orxonox/pickup/items/Jump.h
code/branches/libraries2/src/orxonox/sound/SoundBase.cc
code/branches/libraries2/src/orxonox/sound/SoundManager.cc
code/branches/libraries2/src/orxonox/weaponsystem/Weapon.h
code/branches/libraries2/src/orxonox/weaponsystem/WeaponSlot.h
code/branches/libraries2/src/orxonox/weaponsystem/WeaponSystem.cc
code/branches/libraries2/src/orxonox/worldentities/Backlight.cc
code/branches/libraries2/src/orxonox/worldentities/BigExplosion.cc
code/branches/libraries2/src/orxonox/worldentities/Billboard.cc
code/branches/libraries2/src/orxonox/worldentities/Camera.cc
code/branches/libraries2/src/orxonox/worldentities/Camera.h
code/branches/libraries2/src/orxonox/worldentities/CameraPosition.h
code/branches/libraries2/src/orxonox/worldentities/ControllableEntity.cc
code/branches/libraries2/src/orxonox/worldentities/ExplosionChunk.cc
code/branches/libraries2/src/orxonox/worldentities/Light.cc
code/branches/libraries2/src/orxonox/worldentities/MobileEntity.cc
code/branches/libraries2/src/orxonox/worldentities/Model.cc
code/branches/libraries2/src/orxonox/worldentities/MovableEntity.cc
code/branches/libraries2/src/orxonox/worldentities/ParticleEmitter.cc
code/branches/libraries2/src/orxonox/worldentities/SpawnPoint.cc
code/branches/libraries2/src/orxonox/worldentities/SpawnPoint.h
code/branches/libraries2/src/orxonox/worldentities/TeamSpawnPoint.h
code/branches/libraries2/src/orxonox/worldentities/WorldEntity.cc
code/branches/libraries2/src/orxonox/worldentities/pawns/Destroyer.cc
code/branches/libraries2/src/orxonox/worldentities/pawns/Pawn.cc
code/branches/libraries2/src/orxonox/worldentities/pawns/Pawn.h
code/branches/libraries2/src/orxonox/worldentities/pawns/SpaceShip.cc
code/branches/libraries2/src/orxonox/worldentities/pawns/Spectator.cc
code/branches/libraries2/src/orxonox/worldentities/pawns/Spectator.h
code/branches/libraries2/src/orxonox/worldentities/pawns/TeamBaseMatchBase.cc
Log:
Removed /objects/ from all paths (except from those in the objects module of course).
Compiles again.
Modified: code/branches/libraries2/src/modules/gamestates/GSLevel.cc
===================================================================
--- code/branches/libraries2/src/modules/gamestates/GSLevel.cc 2009-08-31 22:14:43 UTC (rev 5734)
+++ code/branches/libraries2/src/modules/gamestates/GSLevel.cc 2009-08-31 22:38:36 UTC (rev 5735)
@@ -47,7 +47,7 @@
#include "core/XMLFile.h"
#include "tools/interfaces/Tickable.h"
-#include "objects/Radar.h"
+#include "Radar.h"
#include "CameraManager.h"
#include "LevelManager.h"
#include "PlayerManager.h"
Modified: code/branches/libraries2/src/modules/gamestates/GSMainMenu.cc
===================================================================
--- code/branches/libraries2/src/modules/gamestates/GSMainMenu.cc 2009-08-31 22:14:43 UTC (rev 5734)
+++ code/branches/libraries2/src/modules/gamestates/GSMainMenu.cc 2009-08-31 22:38:36 UTC (rev 5735)
@@ -37,7 +37,7 @@
#include "core/ConsoleCommand.h"
#include "core/GraphicsManager.h"
#include "core/GUIManager.h"
-#include "objects/Scene.h"
+#include "Scene.h"
#include "sound/SoundMainMenu.h"
namespace orxonox
Modified: code/branches/libraries2/src/modules/objects/Attacher.h
===================================================================
--- code/branches/libraries2/src/modules/objects/Attacher.h 2009-08-31 22:14:43 UTC (rev 5734)
+++ code/branches/libraries2/src/modules/objects/Attacher.h 2009-08-31 22:38:36 UTC (rev 5735)
@@ -34,7 +34,7 @@
#include <list>
#include <string>
#include "core/XMLNameListener.h"
-#include "objects/worldentities/StaticEntity.h"
+#include "worldentities/StaticEntity.h"
namespace orxonox
{
Modified: code/branches/libraries2/src/modules/objects/ForceField.cc
===================================================================
--- code/branches/libraries2/src/modules/objects/ForceField.cc 2009-08-31 22:14:43 UTC (rev 5734)
+++ code/branches/libraries2/src/modules/objects/ForceField.cc 2009-08-31 22:38:36 UTC (rev 5735)
@@ -30,7 +30,7 @@
#include "core/CoreIncludes.h"
#include "core/XMLPort.h"
-#include "objects/worldentities/MobileEntity.h"
+#include "worldentities/MobileEntity.h"
namespace orxonox
{
@@ -52,7 +52,7 @@
void ForceField::XMLPort(Element& xmlelement, XMLPort::Mode mode)
{
SUPER(ForceField, XMLPort, xmlelement, mode);
-
+
//For correct xml import use: position, direction, velocity, scale
XMLPortParam(ForceField, "velocity", setVelocity, getVelocity, xmlelement, mode).defaultValues(100);
XMLPortParam(ForceField, "diameter", setDiameter, getDiameter, xmlelement, mode).defaultValues(500);
Modified: code/branches/libraries2/src/modules/objects/ForceField.h
===================================================================
--- code/branches/libraries2/src/modules/objects/ForceField.h 2009-08-31 22:14:43 UTC (rev 5734)
+++ code/branches/libraries2/src/modules/objects/ForceField.h 2009-08-31 22:38:36 UTC (rev 5735)
@@ -33,7 +33,7 @@
#include "objects/ObjectsPrereqs.h"
#include "tools/interfaces/Tickable.h"
-#include "objects/worldentities/StaticEntity.h"
+#include "worldentities/StaticEntity.h"
namespace orxonox
{
Modified: code/branches/libraries2/src/modules/objects/Planet.cc
===================================================================
--- code/branches/libraries2/src/modules/objects/Planet.cc 2009-08-31 22:14:43 UTC (rev 5734)
+++ code/branches/libraries2/src/modules/objects/Planet.cc 2009-08-31 22:38:36 UTC (rev 5735)
@@ -35,8 +35,8 @@
#include "core/CoreIncludes.h"
#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"
namespace orxonox
Modified: code/branches/libraries2/src/modules/objects/Planet.h
===================================================================
--- code/branches/libraries2/src/modules/objects/Planet.h 2009-08-31 22:14:43 UTC (rev 5734)
+++ code/branches/libraries2/src/modules/objects/Planet.h 2009-08-31 22:38:36 UTC (rev 5735)
@@ -34,7 +34,7 @@
#include <string>
#include "tools/BillboardSet.h"
#include "tools/Mesh.h"
-#include "objects/worldentities/MovableEntity.h"
+#include "worldentities/MovableEntity.h"
namespace orxonox
{
Modified: code/branches/libraries2/src/modules/objects/collisionshapes/BoxCollisionShape.h
===================================================================
--- code/branches/libraries2/src/modules/objects/collisionshapes/BoxCollisionShape.h 2009-08-31 22:14:43 UTC (rev 5734)
+++ code/branches/libraries2/src/modules/objects/collisionshapes/BoxCollisionShape.h 2009-08-31 22:38:36 UTC (rev 5735)
@@ -32,7 +32,7 @@
#include "objects/ObjectsPrereqs.h"
#include "util/Math.h"
-#include "objects/collisionshapes/CollisionShape.h"
+#include "collisionshapes/CollisionShape.h"
namespace orxonox
{
Modified: code/branches/libraries2/src/modules/objects/collisionshapes/ConeCollisionShape.h
===================================================================
--- code/branches/libraries2/src/modules/objects/collisionshapes/ConeCollisionShape.h 2009-08-31 22:14:43 UTC (rev 5734)
+++ code/branches/libraries2/src/modules/objects/collisionshapes/ConeCollisionShape.h 2009-08-31 22:38:36 UTC (rev 5735)
@@ -30,7 +30,7 @@
#define _ConeCollisionShape_H__
#include "objects/ObjectsPrereqs.h"
-#include "objects/collisionshapes/CollisionShape.h"
+#include "collisionshapes/CollisionShape.h"
namespace orxonox
{
Modified: code/branches/libraries2/src/modules/objects/collisionshapes/PlaneCollisionShape.h
===================================================================
--- code/branches/libraries2/src/modules/objects/collisionshapes/PlaneCollisionShape.h 2009-08-31 22:14:43 UTC (rev 5734)
+++ code/branches/libraries2/src/modules/objects/collisionshapes/PlaneCollisionShape.h 2009-08-31 22:38:36 UTC (rev 5735)
@@ -32,7 +32,7 @@
#include "objects/ObjectsPrereqs.h"
#include "util/Math.h"
-#include "objects/collisionshapes/CollisionShape.h"
+#include "collisionshapes/CollisionShape.h"
namespace orxonox
{
Modified: code/branches/libraries2/src/modules/objects/collisionshapes/SphereCollisionShape.h
===================================================================
--- code/branches/libraries2/src/modules/objects/collisionshapes/SphereCollisionShape.h 2009-08-31 22:14:43 UTC (rev 5734)
+++ code/branches/libraries2/src/modules/objects/collisionshapes/SphereCollisionShape.h 2009-08-31 22:38:36 UTC (rev 5735)
@@ -30,7 +30,7 @@
#define _SphereCollisionShape_H__
#include "objects/ObjectsPrereqs.h"
-#include "objects/collisionshapes/CollisionShape.h"
+#include "collisionshapes/CollisionShape.h"
namespace orxonox
{
Modified: code/branches/libraries2/src/modules/objects/triggers/CheckPoint.cc
===================================================================
--- code/branches/libraries2/src/modules/objects/triggers/CheckPoint.cc 2009-08-31 22:14:43 UTC (rev 5734)
+++ code/branches/libraries2/src/modules/objects/triggers/CheckPoint.cc 2009-08-31 22:38:36 UTC (rev 5735)
@@ -30,8 +30,8 @@
#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
{
Modified: code/branches/libraries2/src/modules/objects/triggers/DistanceTrigger.cc
===================================================================
--- code/branches/libraries2/src/modules/objects/triggers/DistanceTrigger.cc 2009-08-31 22:14:43 UTC (rev 5734)
+++ code/branches/libraries2/src/modules/objects/triggers/DistanceTrigger.cc 2009-08-31 22:38:36 UTC (rev 5735)
@@ -30,7 +30,7 @@
#include "core/CoreIncludes.h"
#include "core/XMLPort.h"
-#include "objects/worldentities/pawns/Pawn.h"
+#include "worldentities/pawns/Pawn.h"
namespace orxonox
{
Modified: code/branches/libraries2/src/modules/objects/triggers/Trigger.cc
===================================================================
--- code/branches/libraries2/src/modules/objects/triggers/Trigger.cc 2009-08-31 22:14:43 UTC (rev 5734)
+++ code/branches/libraries2/src/modules/objects/triggers/Trigger.cc 2009-08-31 22:38:36 UTC (rev 5735)
@@ -32,7 +32,7 @@
#include "core/ConsoleCommand.h"
#include "core/GameMode.h"
#include "core/XMLPort.h"
-#include "objects/Scene.h"
+#include "Scene.h"
namespace orxonox
{
Modified: code/branches/libraries2/src/modules/objects/triggers/Trigger.h
===================================================================
--- code/branches/libraries2/src/modules/objects/triggers/Trigger.h 2009-08-31 22:14:43 UTC (rev 5734)
+++ code/branches/libraries2/src/modules/objects/triggers/Trigger.h 2009-08-31 22:38:36 UTC (rev 5735)
@@ -36,7 +36,7 @@
#include "tools/BillboardSet.h"
#include "tools/interfaces/Tickable.h"
-#include "objects/worldentities/StaticEntity.h"
+#include "worldentities/StaticEntity.h"
namespace orxonox
{
Modified: code/branches/libraries2/src/modules/overlays/GUIOverlay.cc
===================================================================
--- code/branches/libraries2/src/modules/overlays/GUIOverlay.cc 2009-08-31 22:14:43 UTC (rev 5734)
+++ code/branches/libraries2/src/modules/overlays/GUIOverlay.cc 2009-08-31 22:38:36 UTC (rev 5735)
@@ -35,7 +35,7 @@
#include "core/CoreIncludes.h"
#include "core/GUIManager.h"
#include "core/XMLPort.h"
-#include "objects/infos/PlayerInfo.h"
+#include "infos/PlayerInfo.h"
namespace orxonox
{
Modified: code/branches/libraries2/src/modules/overlays/hud/AnnounceMessage.cc
===================================================================
--- code/branches/libraries2/src/modules/overlays/hud/AnnounceMessage.cc 2009-08-31 22:14:43 UTC (rev 5734)
+++ code/branches/libraries2/src/modules/overlays/hud/AnnounceMessage.cc 2009-08-31 22:38:36 UTC (rev 5735)
@@ -29,7 +29,7 @@
#include "AnnounceMessage.h"
#include "core/CoreIncludes.h"
-#include "objects/infos/PlayerInfo.h"
+#include "infos/PlayerInfo.h"
namespace orxonox
{
Modified: code/branches/libraries2/src/modules/overlays/hud/ChatOverlay.cc
===================================================================
--- code/branches/libraries2/src/modules/overlays/hud/ChatOverlay.cc 2009-08-31 22:14:43 UTC (rev 5734)
+++ code/branches/libraries2/src/modules/overlays/hud/ChatOverlay.cc 2009-08-31 22:38:36 UTC (rev 5735)
@@ -38,7 +38,7 @@
#include "core/Executor.h"
#include "tools/Timer.h"
-#include "objects/infos/PlayerInfo.h"
+#include "infos/PlayerInfo.h"
#include "PlayerManager.h"
namespace orxonox
Modified: code/branches/libraries2/src/modules/overlays/hud/DeathMessage.cc
===================================================================
--- code/branches/libraries2/src/modules/overlays/hud/DeathMessage.cc 2009-08-31 22:14:43 UTC (rev 5734)
+++ code/branches/libraries2/src/modules/overlays/hud/DeathMessage.cc 2009-08-31 22:38:36 UTC (rev 5735)
@@ -29,7 +29,7 @@
#include "DeathMessage.h"
#include "core/CoreIncludes.h"
-#include "objects/infos/PlayerInfo.h"
+#include "infos/PlayerInfo.h"
namespace orxonox
{
Modified: code/branches/libraries2/src/modules/overlays/hud/GametypeStatus.cc
===================================================================
--- code/branches/libraries2/src/modules/overlays/hud/GametypeStatus.cc 2009-08-31 22:14:43 UTC (rev 5734)
+++ code/branches/libraries2/src/modules/overlays/hud/GametypeStatus.cc 2009-08-31 22:38:36 UTC (rev 5735)
@@ -30,10 +30,10 @@
#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
{
Modified: code/branches/libraries2/src/modules/overlays/hud/HUDHealthBar.cc
===================================================================
--- code/branches/libraries2/src/modules/overlays/hud/HUDHealthBar.cc 2009-08-31 22:14:43 UTC (rev 5734)
+++ code/branches/libraries2/src/modules/overlays/hud/HUDHealthBar.cc 2009-08-31 22:38:36 UTC (rev 5735)
@@ -31,7 +31,7 @@
#include "util/Convert.h"
#include "core/CoreIncludes.h"
#include "core/XMLPort.h"
-#include "objects/worldentities/pawns/Pawn.h"
+#include "worldentities/pawns/Pawn.h"
#include "overlays/OverlayGroup.h"
namespace orxonox
Modified: code/branches/libraries2/src/modules/overlays/hud/HUDNavigation.cc
===================================================================
--- code/branches/libraries2/src/modules/overlays/hud/HUDNavigation.cc 2009-08-31 22:14:43 UTC (rev 5734)
+++ code/branches/libraries2/src/modules/overlays/hud/HUDNavigation.cc 2009-08-31 22:38:36 UTC (rev 5735)
@@ -38,7 +38,7 @@
#include "util/Convert.h"
#include "core/CoreIncludes.h"
#include "core/XMLPort.h"
-#include "objects/Radar.h"
+#include "Radar.h"
namespace orxonox
{
Modified: code/branches/libraries2/src/modules/overlays/hud/HUDRadar.cc
===================================================================
--- code/branches/libraries2/src/modules/overlays/hud/HUDRadar.cc 2009-08-31 22:14:43 UTC (rev 5734)
+++ code/branches/libraries2/src/modules/overlays/hud/HUDRadar.cc 2009-08-31 22:38:36 UTC (rev 5735)
@@ -37,8 +37,8 @@
#include "core/CoreIncludes.h"
#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
{
Modified: code/branches/libraries2/src/modules/overlays/hud/HUDSpeedBar.cc
===================================================================
--- code/branches/libraries2/src/modules/overlays/hud/HUDSpeedBar.cc 2009-08-31 22:14:43 UTC (rev 5734)
+++ code/branches/libraries2/src/modules/overlays/hud/HUDSpeedBar.cc 2009-08-31 22:38:36 UTC (rev 5735)
@@ -30,8 +30,8 @@
#include "HUDSpeedBar.h"
#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
{
Modified: code/branches/libraries2/src/modules/overlays/hud/HUDTimer.cc
===================================================================
--- code/branches/libraries2/src/modules/overlays/hud/HUDTimer.cc 2009-08-31 22:14:43 UTC (rev 5734)
+++ code/branches/libraries2/src/modules/overlays/hud/HUDTimer.cc 2009-08-31 22:38:36 UTC (rev 5735)
@@ -30,8 +30,8 @@
#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
{
Modified: code/branches/libraries2/src/modules/overlays/hud/KillMessage.cc
===================================================================
--- code/branches/libraries2/src/modules/overlays/hud/KillMessage.cc 2009-08-31 22:14:43 UTC (rev 5734)
+++ code/branches/libraries2/src/modules/overlays/hud/KillMessage.cc 2009-08-31 22:38:36 UTC (rev 5735)
@@ -29,7 +29,7 @@
#include "KillMessage.h"
#include "core/CoreIncludes.h"
-#include "objects/infos/PlayerInfo.h"
+#include "infos/PlayerInfo.h"
namespace orxonox
{
Modified: code/branches/libraries2/src/modules/overlays/hud/TeamBaseMatchScore.cc
===================================================================
--- code/branches/libraries2/src/modules/overlays/hud/TeamBaseMatchScore.cc 2009-08-31 22:14:43 UTC (rev 5734)
+++ code/branches/libraries2/src/modules/overlays/hud/TeamBaseMatchScore.cc 2009-08-31 22:38:36 UTC (rev 5735)
@@ -31,8 +31,8 @@
#include "core/CoreIncludes.h"
#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
{
Modified: code/branches/libraries2/src/modules/overlays/hud/UnderAttackHealthBar.cc
===================================================================
--- code/branches/libraries2/src/modules/overlays/hud/UnderAttackHealthBar.cc 2009-08-31 22:14:43 UTC (rev 5734)
+++ code/branches/libraries2/src/modules/overlays/hud/UnderAttackHealthBar.cc 2009-08-31 22:38:36 UTC (rev 5735)
@@ -30,9 +30,9 @@
#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
{
Modified: code/branches/libraries2/src/modules/overlays/stats/Scoreboard.cc
===================================================================
--- code/branches/libraries2/src/modules/overlays/stats/Scoreboard.cc 2009-08-31 22:14:43 UTC (rev 5734)
+++ code/branches/libraries2/src/modules/overlays/stats/Scoreboard.cc 2009-08-31 22:38:36 UTC (rev 5735)
@@ -28,8 +28,8 @@
#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"
namespace orxonox
Modified: code/branches/libraries2/src/modules/pong/Pong.h
===================================================================
--- code/branches/libraries2/src/modules/pong/Pong.h 2009-08-31 22:14:43 UTC (rev 5734)
+++ code/branches/libraries2/src/modules/pong/Pong.h 2009-08-31 22:38:36 UTC (rev 5735)
@@ -32,7 +32,7 @@
#include "pong/PongPrereqs.h"
#include "tools/Timer.h"
-#include "objects/gametypes/Deathmatch.h"
+#include "gametypes/Deathmatch.h"
namespace orxonox
{
Modified: code/branches/libraries2/src/modules/pong/PongAI.cc
===================================================================
--- code/branches/libraries2/src/modules/pong/PongAI.cc 2009-08-31 22:14:43 UTC (rev 5734)
+++ code/branches/libraries2/src/modules/pong/PongAI.cc 2009-08-31 22:38:36 UTC (rev 5735)
@@ -31,7 +31,7 @@
#include "core/CoreIncludes.h"
#include "core/ConfigValueIncludes.h"
#include "tools/Timer.h"
-#include "objects/worldentities/ControllableEntity.h"
+#include "worldentities/ControllableEntity.h"
#include "PongBall.h"
namespace orxonox
Modified: code/branches/libraries2/src/modules/pong/PongAI.h
===================================================================
--- code/branches/libraries2/src/modules/pong/PongAI.h 2009-08-31 22:14:43 UTC (rev 5734)
+++ code/branches/libraries2/src/modules/pong/PongAI.h 2009-08-31 22:38:36 UTC (rev 5735)
@@ -34,7 +34,7 @@
#include <list>
#include "util/Math.h"
#include "tools/interfaces/Tickable.h"
-#include "objects/controllers/Controller.h"
+#include "controllers/Controller.h"
namespace orxonox
{
Modified: code/branches/libraries2/src/modules/pong/PongBall.cc
===================================================================
--- code/branches/libraries2/src/modules/pong/PongBall.cc 2009-08-31 22:14:43 UTC (rev 5734)
+++ code/branches/libraries2/src/modules/pong/PongBall.cc 2009-08-31 22:38:36 UTC (rev 5735)
@@ -30,7 +30,7 @@
#include "core/CoreIncludes.h"
#include "core/GameMode.h"
-#include "objects/gametypes/Gametype.h"
+#include "gametypes/Gametype.h"
#include "PongBat.h"
#include "sound/SoundBase.h"
Modified: code/branches/libraries2/src/modules/pong/PongBall.h
===================================================================
--- code/branches/libraries2/src/modules/pong/PongBall.h 2009-08-31 22:14:43 UTC (rev 5734)
+++ code/branches/libraries2/src/modules/pong/PongBall.h 2009-08-31 22:38:36 UTC (rev 5735)
@@ -32,7 +32,7 @@
#include "pong/PongPrereqs.h"
#include "util/Math.h"
-#include "objects/worldentities/MovableEntity.h"
+#include "worldentities/MovableEntity.h"
namespace orxonox
{
Modified: code/branches/libraries2/src/modules/pong/PongBat.h
===================================================================
--- code/branches/libraries2/src/modules/pong/PongBat.h 2009-08-31 22:14:43 UTC (rev 5734)
+++ code/branches/libraries2/src/modules/pong/PongBat.h 2009-08-31 22:38:36 UTC (rev 5735)
@@ -30,7 +30,7 @@
#define _PongBat_H__
#include "pong/PongPrereqs.h"
-#include "objects/worldentities/ControllableEntity.h"
+#include "worldentities/ControllableEntity.h"
namespace orxonox
{
Modified: code/branches/libraries2/src/modules/pong/PongBot.h
===================================================================
--- code/branches/libraries2/src/modules/pong/PongBot.h 2009-08-31 22:14:43 UTC (rev 5734)
+++ code/branches/libraries2/src/modules/pong/PongBot.h 2009-08-31 22:38:36 UTC (rev 5735)
@@ -30,7 +30,7 @@
#define _PongBot_H__
#include "pong/PongPrereqs.h"
-#include "objects/infos/Bot.h"
+#include "infos/Bot.h"
namespace orxonox
{
Modified: code/branches/libraries2/src/modules/pong/PongCenterpoint.h
===================================================================
--- code/branches/libraries2/src/modules/pong/PongCenterpoint.h 2009-08-31 22:14:43 UTC (rev 5734)
+++ code/branches/libraries2/src/modules/pong/PongCenterpoint.h 2009-08-31 22:38:36 UTC (rev 5735)
@@ -33,7 +33,7 @@
#include <string>
#include <util/Math.h>
-#include "objects/worldentities/StaticEntity.h"
+#include "worldentities/StaticEntity.h"
namespace orxonox
{
Modified: code/branches/libraries2/src/modules/pong/PongScore.cc
===================================================================
--- code/branches/libraries2/src/modules/pong/PongScore.cc 2009-08-31 22:14:43 UTC (rev 5734)
+++ code/branches/libraries2/src/modules/pong/PongScore.cc 2009-08-31 22:38:36 UTC (rev 5735)
@@ -32,7 +32,7 @@
#include "core/CoreIncludes.h"
#include "core/XMLPort.h"
#include "Pong.h"
-#include "objects/infos/PlayerInfo.h"
+#include "infos/PlayerInfo.h"
namespace orxonox
{
Modified: code/branches/libraries2/src/modules/questsystem/QuestEffectBeacon.cc
===================================================================
--- code/branches/libraries2/src/modules/questsystem/QuestEffectBeacon.cc 2009-08-31 22:14:43 UTC (rev 5734)
+++ code/branches/libraries2/src/modules/questsystem/QuestEffectBeacon.cc 2009-08-31 22:38:36 UTC (rev 5735)
@@ -36,7 +36,7 @@
#include "core/CoreIncludes.h"
#include "core/XMLPort.h"
#include "core/EventIncludes.h"
-#include "objects/worldentities/pawns/Pawn.h"
+#include "worldentities/pawns/Pawn.h"
#include "interfaces/PlayerTrigger.h"
#include "QuestEffect.h"
Modified: code/branches/libraries2/src/modules/questsystem/QuestEffectBeacon.h
===================================================================
--- code/branches/libraries2/src/modules/questsystem/QuestEffectBeacon.h 2009-08-31 22:14:43 UTC (rev 5734)
+++ code/branches/libraries2/src/modules/questsystem/QuestEffectBeacon.h 2009-08-31 22:38:36 UTC (rev 5735)
@@ -37,7 +37,7 @@
#include "questsystem/QuestsystemPrereqs.h"
#include <list>
-#include "objects/worldentities/StaticEntity.h"
+#include "worldentities/StaticEntity.h"
namespace orxonox
{
Modified: code/branches/libraries2/src/modules/questsystem/QuestManager.cc
===================================================================
--- code/branches/libraries2/src/modules/questsystem/QuestManager.cc 2009-08-31 22:14:43 UTC (rev 5734)
+++ code/branches/libraries2/src/modules/questsystem/QuestManager.cc 2009-08-31 22:38:36 UTC (rev 5735)
@@ -37,7 +37,7 @@
#include "core/CoreIncludes.h"
#include "core/GUIManager.h"
-#include "objects/infos/PlayerInfo.h"
+#include "infos/PlayerInfo.h"
#include "Quest.h"
#include "QuestHint.h"
#include "QuestItem.h"
Modified: code/branches/libraries2/src/modules/weapons/MuzzleFlash.h
===================================================================
--- code/branches/libraries2/src/modules/weapons/MuzzleFlash.h 2009-08-31 22:14:43 UTC (rev 5734)
+++ code/branches/libraries2/src/modules/weapons/MuzzleFlash.h 2009-08-31 22:38:36 UTC (rev 5735)
@@ -32,7 +32,7 @@
#include "weapons/WeaponsPrereqs.h"
#include "tools/Timer.h"
-#include "objects/worldentities/Billboard.h"
+#include "worldentities/Billboard.h"
namespace orxonox
{
Modified: code/branches/libraries2/src/modules/weapons/munitions/FusionMunition.h
===================================================================
--- code/branches/libraries2/src/modules/weapons/munitions/FusionMunition.h 2009-08-31 22:14:43 UTC (rev 5734)
+++ code/branches/libraries2/src/modules/weapons/munitions/FusionMunition.h 2009-08-31 22:38:36 UTC (rev 5735)
@@ -30,7 +30,7 @@
#define _FusionMunition_H__
#include "weapons/WeaponsPrereqs.h"
-#include "objects/weaponsystem/Munition.h"
+#include "weaponsystem/Munition.h"
namespace orxonox
{
Modified: code/branches/libraries2/src/modules/weapons/munitions/ReplenishingMunition.h
===================================================================
--- code/branches/libraries2/src/modules/weapons/munitions/ReplenishingMunition.h 2009-08-31 22:14:43 UTC (rev 5734)
+++ code/branches/libraries2/src/modules/weapons/munitions/ReplenishingMunition.h 2009-08-31 22:38:36 UTC (rev 5735)
@@ -32,7 +32,7 @@
#include "weapons/WeaponsPrereqs.h"
#include "tools/Timer.h"
-#include "objects/weaponsystem/Munition.h"
+#include "weaponsystem/Munition.h"
namespace orxonox
{
Modified: code/branches/libraries2/src/modules/weapons/projectiles/BillboardProjectile.cc
===================================================================
--- code/branches/libraries2/src/modules/weapons/projectiles/BillboardProjectile.cc 2009-08-31 22:14:43 UTC (rev 5734)
+++ code/branches/libraries2/src/modules/weapons/projectiles/BillboardProjectile.cc 2009-08-31 22:38:36 UTC (rev 5735)
@@ -30,7 +30,7 @@
#include "core/CoreIncludes.h"
#include "core/GameMode.h"
-#include "objects/Scene.h"
+#include "Scene.h"
namespace orxonox
{
@@ -60,7 +60,7 @@
{
this->billboard_.setColour(colour);
}
-
+
void BillboardProjectile::setMaterial(const std::string& material)
{
this->billboard_.setMaterial(material);
Modified: code/branches/libraries2/src/modules/weapons/projectiles/ParticleProjectile.cc
===================================================================
--- code/branches/libraries2/src/modules/weapons/projectiles/ParticleProjectile.cc 2009-08-31 22:14:43 UTC (rev 5734)
+++ code/branches/libraries2/src/modules/weapons/projectiles/ParticleProjectile.cc 2009-08-31 22:38:36 UTC (rev 5735)
@@ -31,7 +31,7 @@
#include <OgreParticleEmitter.h>
#include "tools/ParticleInterface.h"
#include "core/CoreIncludes.h"
-#include "objects/Scene.h"
+#include "Scene.h"
namespace orxonox
{
Modified: code/branches/libraries2/src/modules/weapons/projectiles/Projectile.cc
===================================================================
--- code/branches/libraries2/src/modules/weapons/projectiles/Projectile.cc 2009-08-31 22:14:43 UTC (rev 5734)
+++ code/branches/libraries2/src/modules/weapons/projectiles/Projectile.cc 2009-08-31 22:38:36 UTC (rev 5735)
@@ -33,8 +33,8 @@
#include "core/Executor.h"
#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
{
Modified: code/branches/libraries2/src/modules/weapons/projectiles/Projectile.h
===================================================================
--- code/branches/libraries2/src/modules/weapons/projectiles/Projectile.h 2009-08-31 22:14:43 UTC (rev 5734)
+++ code/branches/libraries2/src/modules/weapons/projectiles/Projectile.h 2009-08-31 22:38:36 UTC (rev 5735)
@@ -33,7 +33,7 @@
#include "tools/Timer.h"
#include "interfaces/PawnListener.h"
-#include "objects/worldentities/MovableEntity.h"
+#include "worldentities/MovableEntity.h"
namespace orxonox
{
Modified: code/branches/libraries2/src/modules/weapons/weaponmodes/EnergyDrink.cc
===================================================================
--- code/branches/libraries2/src/modules/weapons/weaponmodes/EnergyDrink.cc 2009-08-31 22:14:43 UTC (rev 5734)
+++ code/branches/libraries2/src/modules/weapons/weaponmodes/EnergyDrink.cc 2009-08-31 22:38:36 UTC (rev 5735)
@@ -31,13 +31,13 @@
#include "core/CoreIncludes.h"
#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
{
Modified: code/branches/libraries2/src/modules/weapons/weaponmodes/EnergyDrink.h
===================================================================
--- code/branches/libraries2/src/modules/weapons/weaponmodes/EnergyDrink.h 2009-08-31 22:14:43 UTC (rev 5734)
+++ code/branches/libraries2/src/modules/weapons/weaponmodes/EnergyDrink.h 2009-08-31 22:38:36 UTC (rev 5735)
@@ -33,7 +33,7 @@
#include <string>
#include "tools/Timer.h"
-#include "objects/weaponsystem/WeaponMode.h"
+#include "weaponsystem/WeaponMode.h"
namespace orxonox
{
Modified: code/branches/libraries2/src/modules/weapons/weaponmodes/FusionFire.cc
===================================================================
--- code/branches/libraries2/src/modules/weapons/weaponmodes/FusionFire.cc 2009-08-31 22:14:43 UTC (rev 5734)
+++ code/branches/libraries2/src/modules/weapons/weaponmodes/FusionFire.cc 2009-08-31 22:38:36 UTC (rev 5735)
@@ -32,9 +32,9 @@
#include "core/CoreIncludes.h"
#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
{
Modified: code/branches/libraries2/src/modules/weapons/weaponmodes/FusionFire.h
===================================================================
--- code/branches/libraries2/src/modules/weapons/weaponmodes/FusionFire.h 2009-08-31 22:14:43 UTC (rev 5734)
+++ code/branches/libraries2/src/modules/weapons/weaponmodes/FusionFire.h 2009-08-31 22:38:36 UTC (rev 5735)
@@ -30,7 +30,7 @@
#define _FusionFire_H__
#include "weapons/WeaponsPrereqs.h"
-#include "objects/weaponsystem/WeaponMode.h"
+#include "weaponsystem/WeaponMode.h"
namespace orxonox
{
Modified: code/branches/libraries2/src/modules/weapons/weaponmodes/HsW01.cc
===================================================================
--- code/branches/libraries2/src/modules/weapons/weaponmodes/HsW01.cc 2009-08-31 22:14:43 UTC (rev 5734)
+++ code/branches/libraries2/src/modules/weapons/weaponmodes/HsW01.cc 2009-08-31 22:38:36 UTC (rev 5735)
@@ -31,13 +31,13 @@
#include "core/CoreIncludes.h"
#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
{
Modified: code/branches/libraries2/src/modules/weapons/weaponmodes/HsW01.h
===================================================================
--- code/branches/libraries2/src/modules/weapons/weaponmodes/HsW01.h 2009-08-31 22:14:43 UTC (rev 5734)
+++ code/branches/libraries2/src/modules/weapons/weaponmodes/HsW01.h 2009-08-31 22:38:36 UTC (rev 5735)
@@ -32,7 +32,7 @@
#include "weapons/WeaponsPrereqs.h"
#include "tools/Timer.h"
-#include "objects/weaponsystem/WeaponMode.h"
+#include "weaponsystem/WeaponMode.h"
namespace orxonox
{
Modified: code/branches/libraries2/src/modules/weapons/weaponmodes/LaserFire.cc
===================================================================
--- code/branches/libraries2/src/modules/weapons/weaponmodes/LaserFire.cc 2009-08-31 22:14:43 UTC (rev 5734)
+++ code/branches/libraries2/src/modules/weapons/weaponmodes/LaserFire.cc 2009-08-31 22:38:36 UTC (rev 5735)
@@ -30,9 +30,9 @@
#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
{
Modified: code/branches/libraries2/src/modules/weapons/weaponmodes/LaserFire.h
===================================================================
--- code/branches/libraries2/src/modules/weapons/weaponmodes/LaserFire.h 2009-08-31 22:14:43 UTC (rev 5734)
+++ code/branches/libraries2/src/modules/weapons/weaponmodes/LaserFire.h 2009-08-31 22:38:36 UTC (rev 5735)
@@ -30,7 +30,7 @@
#define _LaserFire_H__
#include "weapons/WeaponsPrereqs.h"
-#include "objects/weaponsystem/WeaponMode.h"
+#include "weaponsystem/WeaponMode.h"
namespace orxonox
{
Modified: code/branches/libraries2/src/modules/weapons/weaponmodes/LightningGun.cc
===================================================================
--- code/branches/libraries2/src/modules/weapons/weaponmodes/LightningGun.cc 2009-08-31 22:14:43 UTC (rev 5734)
+++ code/branches/libraries2/src/modules/weapons/weaponmodes/LightningGun.cc 2009-08-31 22:38:36 UTC (rev 5735)
@@ -30,9 +30,9 @@
#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
{
Modified: code/branches/libraries2/src/modules/weapons/weaponmodes/LightningGun.h
===================================================================
--- code/branches/libraries2/src/modules/weapons/weaponmodes/LightningGun.h 2009-08-31 22:14:43 UTC (rev 5734)
+++ code/branches/libraries2/src/modules/weapons/weaponmodes/LightningGun.h 2009-08-31 22:38:36 UTC (rev 5735)
@@ -30,7 +30,7 @@
#define _LightningGun_H__
#include "weapons/WeaponsPrereqs.h"
-#include "objects/weaponsystem/WeaponMode.h"
+#include "weaponsystem/WeaponMode.h"
namespace orxonox
{
Modified: code/branches/libraries2/src/orxonox/CMakeLists.txt
===================================================================
--- code/branches/libraries2/src/orxonox/CMakeLists.txt 2009-08-31 22:14:43 UTC (rev 5734)
+++ code/branches/libraries2/src/orxonox/CMakeLists.txt 2009-08-31 22:38:36 UTC (rev 5735)
@@ -47,8 +47,8 @@
FIND_HEADER_FILES
TOLUA_FILES
LevelManager.h
- objects/pickup/BaseItem.h
- objects/pickup/PickupInventory.h
+ pickup/BaseItem.h
+ pickup/PickupInventory.h
DEFINE_SYMBOL
"ORXONOX_SHARED_BUILD"
PCH_FILE
Modified: code/branches/libraries2/src/orxonox/CameraManager.cc
===================================================================
--- code/branches/libraries2/src/orxonox/CameraManager.cc 2009-08-31 22:14:43 UTC (rev 5734)
+++ code/branches/libraries2/src/orxonox/CameraManager.cc 2009-08-31 22:38:36 UTC (rev 5735)
@@ -36,8 +36,8 @@
#include "core/GUIManager.h"
#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
{
Modified: code/branches/libraries2/src/orxonox/GlobalShader.cc
===================================================================
--- code/branches/libraries2/src/orxonox/GlobalShader.cc 2009-08-31 22:14:43 UTC (rev 5734)
+++ code/branches/libraries2/src/orxonox/GlobalShader.cc 2009-08-31 22:38:36 UTC (rev 5735)
@@ -31,7 +31,7 @@
#include "util/Exception.h"
#include "core/CoreIncludes.h"
#include "core/XMLPort.h"
-#include "objects/Scene.h"
+#include "Scene.h"
namespace orxonox
{
Modified: code/branches/libraries2/src/orxonox/Level.cc
===================================================================
--- code/branches/libraries2/src/orxonox/Level.cc 2009-08-31 22:14:43 UTC (rev 5734)
+++ code/branches/libraries2/src/orxonox/Level.cc 2009-08-31 22:38:36 UTC (rev 5735)
@@ -36,8 +36,8 @@
#include "core/XMLFile.h"
#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"
#include "LevelManager.h"
Modified: code/branches/libraries2/src/orxonox/LevelManager.cc
===================================================================
--- code/branches/libraries2/src/orxonox/LevelManager.cc 2009-08-31 22:14:43 UTC (rev 5734)
+++ code/branches/libraries2/src/orxonox/LevelManager.cc 2009-08-31 22:38:36 UTC (rev 5735)
@@ -37,8 +37,8 @@
#include "core/CoreIncludes.h"
#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
{
Modified: code/branches/libraries2/src/orxonox/OrxonoxPrereqs.h
===================================================================
--- code/branches/libraries2/src/orxonox/OrxonoxPrereqs.h 2009-08-31 22:14:43 UTC (rev 5734)
+++ code/branches/libraries2/src/orxonox/OrxonoxPrereqs.h 2009-08-31 22:38:36 UTC (rev 5735)
@@ -63,12 +63,15 @@
namespace orxonox
{
- // manager
class CameraManager;
class LevelManager;
class PawnManager;
class PlayerManager;
+ class Level;
+ class Scene;
+ class Tickable;
+
// interfaces
class GametypeMessageListener;
class NotificationListener;
@@ -79,11 +82,6 @@
class Rewardable;
class Teamcolourable;
- // objects
- class Level;
- class Scene;
- class Tickable;
-
// worldentities
class WorldEntity;
class StaticEntity;
Modified: code/branches/libraries2/src/orxonox/PawnManager.cc
===================================================================
--- code/branches/libraries2/src/orxonox/PawnManager.cc 2009-08-31 22:14:43 UTC (rev 5734)
+++ code/branches/libraries2/src/orxonox/PawnManager.cc 2009-08-31 22:38:36 UTC (rev 5735)
@@ -29,7 +29,7 @@
#include "PawnManager.h"
#include "core/CoreIncludes.h"
-#include "objects/worldentities/pawns/Pawn.h"
+#include "worldentities/pawns/Pawn.h"
namespace orxonox
{
Modified: code/branches/libraries2/src/orxonox/PlayerManager.cc
===================================================================
--- code/branches/libraries2/src/orxonox/PlayerManager.cc 2009-08-31 22:14:43 UTC (rev 5734)
+++ code/branches/libraries2/src/orxonox/PlayerManager.cc 2009-08-31 22:38:36 UTC (rev 5735)
@@ -30,8 +30,8 @@
#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"
namespace orxonox
Modified: code/branches/libraries2/src/orxonox/Scene.cc
===================================================================
--- code/branches/libraries2/src/orxonox/Scene.cc 2009-08-31 22:14:43 UTC (rev 5734)
+++ code/branches/libraries2/src/orxonox/Scene.cc 2009-08-31 22:38:36 UTC (rev 5735)
@@ -43,7 +43,7 @@
#include "core/GameMode.h"
#include "core/XMLPort.h"
#include "tools/BulletConversions.h"
-#include "objects/worldentities/WorldEntity.h"
+#include "worldentities/WorldEntity.h"
namespace orxonox
{
Modified: code/branches/libraries2/src/orxonox/collisionshapes/CollisionShape.cc
===================================================================
--- code/branches/libraries2/src/orxonox/collisionshapes/CollisionShape.cc 2009-08-31 22:14:43 UTC (rev 5734)
+++ code/branches/libraries2/src/orxonox/collisionshapes/CollisionShape.cc 2009-08-31 22:38:36 UTC (rev 5735)
@@ -32,7 +32,7 @@
#include "core/CoreIncludes.h"
#include "core/XMLPort.h"
-#include "objects/worldentities/WorldEntity.h"
+#include "worldentities/WorldEntity.h"
#include "CompoundCollisionShape.h"
#include "WorldEntityCollisionShape.h"
Modified: code/branches/libraries2/src/orxonox/collisionshapes/WorldEntityCollisionShape.cc
===================================================================
--- code/branches/libraries2/src/orxonox/collisionshapes/WorldEntityCollisionShape.cc 2009-08-31 22:14:43 UTC (rev 5734)
+++ code/branches/libraries2/src/orxonox/collisionshapes/WorldEntityCollisionShape.cc 2009-08-31 22:38:36 UTC (rev 5735)
@@ -32,7 +32,7 @@
#include "util/OrxAssert.h"
#include "core/CoreIncludes.h"
-#include "objects/worldentities/WorldEntity.h"
+#include "worldentities/WorldEntity.h"
namespace orxonox
{
Modified: code/branches/libraries2/src/orxonox/controllers/AIController.cc
===================================================================
--- code/branches/libraries2/src/orxonox/controllers/AIController.cc 2009-08-31 22:14:43 UTC (rev 5734)
+++ code/branches/libraries2/src/orxonox/controllers/AIController.cc 2009-08-31 22:38:36 UTC (rev 5735)
@@ -31,7 +31,7 @@
#include "util/Math.h"
#include "core/CoreIncludes.h"
#include "core/Executor.h"
-#include "objects/worldentities/ControllableEntity.h"
+#include "worldentities/ControllableEntity.h"
namespace orxonox
{
Modified: code/branches/libraries2/src/orxonox/controllers/ArtificialController.cc
===================================================================
--- code/branches/libraries2/src/orxonox/controllers/ArtificialController.cc 2009-08-31 22:14:43 UTC (rev 5734)
+++ code/branches/libraries2/src/orxonox/controllers/ArtificialController.cc 2009-08-31 22:38:36 UTC (rev 5735)
@@ -29,11 +29,11 @@
#include "ArtificialController.h"
#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
{
Modified: code/branches/libraries2/src/orxonox/controllers/HumanController.cc
===================================================================
--- code/branches/libraries2/src/orxonox/controllers/HumanController.cc 2009-08-31 22:14:43 UTC (rev 5734)
+++ code/branches/libraries2/src/orxonox/controllers/HumanController.cc 2009-08-31 22:38:36 UTC (rev 5735)
@@ -30,10 +30,10 @@
#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"
namespace orxonox
Modified: code/branches/libraries2/src/orxonox/controllers/WaypointController.cc
===================================================================
--- code/branches/libraries2/src/orxonox/controllers/WaypointController.cc 2009-08-31 22:14:43 UTC (rev 5734)
+++ code/branches/libraries2/src/orxonox/controllers/WaypointController.cc 2009-08-31 22:38:36 UTC (rev 5735)
@@ -30,7 +30,7 @@
#include "core/CoreIncludes.h"
#include "core/XMLPort.h"
-#include "objects/worldentities/ControllableEntity.h"
+#include "worldentities/ControllableEntity.h"
namespace orxonox
{
Modified: code/branches/libraries2/src/orxonox/controllers/WaypointPatrolController.cc
===================================================================
--- code/branches/libraries2/src/orxonox/controllers/WaypointPatrolController.cc 2009-08-31 22:14:43 UTC (rev 5734)
+++ code/branches/libraries2/src/orxonox/controllers/WaypointPatrolController.cc 2009-08-31 22:38:36 UTC (rev 5735)
@@ -31,7 +31,7 @@
#include "util/Math.h"
#include "core/CoreIncludes.h"
#include "core/XMLPort.h"
-#include "objects/worldentities/pawns/Pawn.h"
+#include "worldentities/pawns/Pawn.h"
namespace orxonox
{
Modified: code/branches/libraries2/src/orxonox/gametypes/Asteroids.cc
===================================================================
--- code/branches/libraries2/src/orxonox/gametypes/Asteroids.cc 2009-08-31 22:14:43 UTC (rev 5734)
+++ code/branches/libraries2/src/orxonox/gametypes/Asteroids.cc 2009-08-31 22:38:36 UTC (rev 5735)
@@ -30,7 +30,7 @@
#include "core/CoreIncludes.h"
#include "network/Host.h"
-#include "objects/worldentities/pawns/Pawn.h"
+#include "worldentities/pawns/Pawn.h"
namespace orxonox
{
Modified: code/branches/libraries2/src/orxonox/gametypes/Deathmatch.cc
===================================================================
--- code/branches/libraries2/src/orxonox/gametypes/Deathmatch.cc 2009-08-31 22:14:43 UTC (rev 5734)
+++ code/branches/libraries2/src/orxonox/gametypes/Deathmatch.cc 2009-08-31 22:38:36 UTC (rev 5735)
@@ -30,8 +30,8 @@
#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
{
Modified: code/branches/libraries2/src/orxonox/gametypes/Gametype.cc
===================================================================
--- code/branches/libraries2/src/orxonox/gametypes/Gametype.cc 2009-08-31 22:14:43 UTC (rev 5734)
+++ code/branches/libraries2/src/orxonox/gametypes/Gametype.cc 2009-08-31 22:38:36 UTC (rev 5735)
@@ -33,13 +33,13 @@
#include "core/ConfigValueIncludes.h"
#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"
namespace orxonox
Modified: code/branches/libraries2/src/orxonox/gametypes/Gametype.h
===================================================================
--- code/branches/libraries2/src/orxonox/gametypes/Gametype.h 2009-08-31 22:14:43 UTC (rev 5734)
+++ code/branches/libraries2/src/orxonox/gametypes/Gametype.h 2009-08-31 22:38:36 UTC (rev 5735)
@@ -38,7 +38,7 @@
#include "core/BaseObject.h"
#include "core/Identifier.h"
#include "tools/interfaces/Tickable.h"
-#include "objects/infos/GametypeInfo.h"
+#include "infos/GametypeInfo.h"
namespace orxonox
{
Modified: code/branches/libraries2/src/orxonox/gametypes/TeamBaseMatch.cc
===================================================================
--- code/branches/libraries2/src/orxonox/gametypes/TeamBaseMatch.cc 2009-08-31 22:14:43 UTC (rev 5734)
+++ code/branches/libraries2/src/orxonox/gametypes/TeamBaseMatch.cc 2009-08-31 22:38:36 UTC (rev 5735)
@@ -30,8 +30,8 @@
#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
{
Modified: code/branches/libraries2/src/orxonox/gametypes/TeamDeathmatch.cc
===================================================================
--- code/branches/libraries2/src/orxonox/gametypes/TeamDeathmatch.cc 2009-08-31 22:14:43 UTC (rev 5734)
+++ code/branches/libraries2/src/orxonox/gametypes/TeamDeathmatch.cc 2009-08-31 22:38:36 UTC (rev 5735)
@@ -31,8 +31,8 @@
#include "core/CoreIncludes.h"
#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
{
Modified: code/branches/libraries2/src/orxonox/gametypes/UnderAttack.cc
===================================================================
--- code/branches/libraries2/src/orxonox/gametypes/UnderAttack.cc 2009-08-31 22:14:43 UTC (rev 5734)
+++ code/branches/libraries2/src/orxonox/gametypes/UnderAttack.cc 2009-08-31 22:38:36 UTC (rev 5735)
@@ -32,8 +32,8 @@
#include "core/CoreIncludes.h"
#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
{
Modified: code/branches/libraries2/src/orxonox/infos/Bot.cc
===================================================================
--- code/branches/libraries2/src/orxonox/infos/Bot.cc 2009-08-31 22:14:43 UTC (rev 5734)
+++ code/branches/libraries2/src/orxonox/infos/Bot.cc 2009-08-31 22:38:36 UTC (rev 5735)
@@ -32,8 +32,8 @@
#include "core/GameMode.h"
#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
{
Modified: code/branches/libraries2/src/orxonox/infos/HumanPlayer.cc
===================================================================
--- code/branches/libraries2/src/orxonox/infos/HumanPlayer.cc 2009-08-31 22:14:43 UTC (rev 5734)
+++ code/branches/libraries2/src/orxonox/infos/HumanPlayer.cc 2009-08-31 22:38:36 UTC (rev 5735)
@@ -33,8 +33,8 @@
#include "core/GameMode.h"
#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"
namespace orxonox
Modified: code/branches/libraries2/src/orxonox/infos/PlayerInfo.cc
===================================================================
--- code/branches/libraries2/src/orxonox/infos/PlayerInfo.cc 2009-08-31 22:14:43 UTC (rev 5734)
+++ code/branches/libraries2/src/orxonox/infos/PlayerInfo.cc 2009-08-31 22:38:36 UTC (rev 5735)
@@ -32,8 +32,8 @@
#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
{
Modified: code/branches/libraries2/src/orxonox/infos/PlayerInfo.h
===================================================================
--- code/branches/libraries2/src/orxonox/infos/PlayerInfo.h 2009-08-31 22:14:43 UTC (rev 5734)
+++ code/branches/libraries2/src/orxonox/infos/PlayerInfo.h 2009-08-31 22:38:36 UTC (rev 5735)
@@ -33,7 +33,7 @@
#include "Info.h"
#include "core/Identifier.h"
-#include "objects/controllers/Controller.h"
+#include "controllers/Controller.h"
namespace orxonox
{
Modified: code/branches/libraries2/src/orxonox/interfaces/RadarViewable.cc
===================================================================
--- code/branches/libraries2/src/orxonox/interfaces/RadarViewable.cc 2009-08-31 22:14:43 UTC (rev 5734)
+++ code/branches/libraries2/src/orxonox/interfaces/RadarViewable.cc 2009-08-31 22:38:36 UTC (rev 5735)
@@ -35,8 +35,8 @@
#include "util/StringUtils.h"
#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"
namespace orxonox
Modified: code/branches/libraries2/src/orxonox/items/Engine.cc
===================================================================
--- code/branches/libraries2/src/orxonox/items/Engine.cc 2009-08-31 22:14:43 UTC (rev 5734)
+++ code/branches/libraries2/src/orxonox/items/Engine.cc 2009-08-31 22:38:36 UTC (rev 5735)
@@ -32,9 +32,9 @@
#include "core/CoreIncludes.h"
#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"
Modified: code/branches/libraries2/src/orxonox/items/MultiStateEngine.cc
===================================================================
--- code/branches/libraries2/src/orxonox/items/MultiStateEngine.cc 2009-08-31 22:14:43 UTC (rev 5734)
+++ code/branches/libraries2/src/orxonox/items/MultiStateEngine.cc 2009-08-31 22:38:36 UTC (rev 5735)
@@ -31,7 +31,7 @@
#include "core/CoreIncludes.h"
#include "core/GameMode.h"
#include "core/XMLPort.h"
-#include "objects/worldentities/pawns/SpaceShip.h"
+#include "worldentities/pawns/SpaceShip.h"
namespace orxonox
{
Modified: code/branches/libraries2/src/orxonox/overlays/Map.cc
===================================================================
--- code/branches/libraries2/src/orxonox/overlays/Map.cc 2009-08-31 22:14:43 UTC (rev 5734)
+++ code/branches/libraries2/src/orxonox/overlays/Map.cc 2009-08-31 22:38:36 UTC (rev 5735)
@@ -52,10 +52,10 @@
#include "core/CoreIncludes.h"
#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
{
Modified: code/branches/libraries2/src/orxonox/pickup/BaseItem.cc
===================================================================
--- code/branches/libraries2/src/orxonox/pickup/BaseItem.cc 2009-08-31 22:14:43 UTC (rev 5734)
+++ code/branches/libraries2/src/orxonox/pickup/BaseItem.cc 2009-08-31 22:38:36 UTC (rev 5735)
@@ -35,7 +35,7 @@
#include "core/CoreIncludes.h"
#include "core/XMLPort.h"
-#include "objects/worldentities/pawns/Pawn.h"
+#include "worldentities/pawns/Pawn.h"
namespace orxonox
{
Modified: code/branches/libraries2/src/orxonox/pickup/DroppedItem.cc
===================================================================
--- code/branches/libraries2/src/orxonox/pickup/DroppedItem.cc 2009-08-31 22:14:43 UTC (rev 5734)
+++ code/branches/libraries2/src/orxonox/pickup/DroppedItem.cc 2009-08-31 22:38:36 UTC (rev 5735)
@@ -32,9 +32,9 @@
#include "core/CoreIncludes.h"
#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
{
Modified: code/branches/libraries2/src/orxonox/pickup/DroppedItem.h
===================================================================
--- code/branches/libraries2/src/orxonox/pickup/DroppedItem.h 2009-08-31 22:14:43 UTC (rev 5734)
+++ code/branches/libraries2/src/orxonox/pickup/DroppedItem.h 2009-08-31 22:38:36 UTC (rev 5735)
@@ -38,7 +38,7 @@
#include "tools/Timer.h"
#include "tools/interfaces/Tickable.h"
-#include "objects/worldentities/StaticEntity.h"
+#include "worldentities/StaticEntity.h"
namespace orxonox
{
Modified: code/branches/libraries2/src/orxonox/pickup/ModifierPickup.cc
===================================================================
--- code/branches/libraries2/src/orxonox/pickup/ModifierPickup.cc 2009-08-31 22:14:43 UTC (rev 5734)
+++ code/branches/libraries2/src/orxonox/pickup/ModifierPickup.cc 2009-08-31 22:38:36 UTC (rev 5735)
@@ -35,7 +35,7 @@
#include "core/CoreIncludes.h"
#include "core/XMLPort.h"
-#include "objects/worldentities/pawns/Pawn.h"
+#include "worldentities/pawns/Pawn.h"
namespace orxonox
{
Modified: code/branches/libraries2/src/orxonox/pickup/PickupInventory.cc
===================================================================
--- code/branches/libraries2/src/orxonox/pickup/PickupInventory.cc 2009-08-31 22:14:43 UTC (rev 5734)
+++ code/branches/libraries2/src/orxonox/pickup/PickupInventory.cc 2009-08-31 22:38:36 UTC (rev 5735)
@@ -38,8 +38,8 @@
#include "core/ConsoleCommand.h"
#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"
#include "PassiveItem.h"
Modified: code/branches/libraries2/src/orxonox/pickup/PickupSpawner.cc
===================================================================
--- code/branches/libraries2/src/orxonox/pickup/PickupSpawner.cc 2009-08-31 22:14:43 UTC (rev 5734)
+++ code/branches/libraries2/src/orxonox/pickup/PickupSpawner.cc 2009-08-31 22:38:36 UTC (rev 5735)
@@ -39,7 +39,7 @@
#include "core/GUIManager.h" // HACK; see below
#include "core/Template.h"
#include "core/XMLPort.h"
-#include "objects/worldentities/pawns/Pawn.h"
+#include "worldentities/pawns/Pawn.h"
#include "PickupInventory.h" // HACK; Only for hack, remove later
Modified: code/branches/libraries2/src/orxonox/pickup/PickupSpawner.h
===================================================================
--- code/branches/libraries2/src/orxonox/pickup/PickupSpawner.h 2009-08-31 22:14:43 UTC (rev 5734)
+++ code/branches/libraries2/src/orxonox/pickup/PickupSpawner.h 2009-08-31 22:38:36 UTC (rev 5735)
@@ -39,7 +39,7 @@
#include <string>
#include "tools/Timer.h"
#include "tools/interfaces/Tickable.h"
-#include "objects/worldentities/StaticEntity.h"
+#include "worldentities/StaticEntity.h"
namespace orxonox
{
Modified: code/branches/libraries2/src/orxonox/pickup/items/HealthImmediate.cc
===================================================================
--- code/branches/libraries2/src/orxonox/pickup/items/HealthImmediate.cc 2009-08-31 22:14:43 UTC (rev 5734)
+++ code/branches/libraries2/src/orxonox/pickup/items/HealthImmediate.cc 2009-08-31 22:38:36 UTC (rev 5735)
@@ -35,7 +35,7 @@
#include "core/CoreIncludes.h"
#include "core/XMLPort.h"
-#include "objects/worldentities/pawns/Pawn.h"
+#include "worldentities/pawns/Pawn.h"
namespace orxonox
{
Modified: code/branches/libraries2/src/orxonox/pickup/items/HealthImmediate.h
===================================================================
--- code/branches/libraries2/src/orxonox/pickup/items/HealthImmediate.h 2009-08-31 22:14:43 UTC (rev 5734)
+++ code/branches/libraries2/src/orxonox/pickup/items/HealthImmediate.h 2009-08-31 22:38:36 UTC (rev 5735)
@@ -35,7 +35,7 @@
#define _HealthImmediate_H__
#include "OrxonoxPrereqs.h"
-#include "objects/pickup/PassiveItem.h"
+#include "pickup/PassiveItem.h"
namespace orxonox
{
Modified: code/branches/libraries2/src/orxonox/pickup/items/HealthUsable.cc
===================================================================
--- code/branches/libraries2/src/orxonox/pickup/items/HealthUsable.cc 2009-08-31 22:14:43 UTC (rev 5734)
+++ code/branches/libraries2/src/orxonox/pickup/items/HealthUsable.cc 2009-08-31 22:38:36 UTC (rev 5735)
@@ -36,8 +36,8 @@
#include "util/Math.h"
#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
{
Modified: code/branches/libraries2/src/orxonox/pickup/items/HealthUsable.h
===================================================================
--- code/branches/libraries2/src/orxonox/pickup/items/HealthUsable.h 2009-08-31 22:14:43 UTC (rev 5734)
+++ code/branches/libraries2/src/orxonox/pickup/items/HealthUsable.h 2009-08-31 22:38:36 UTC (rev 5735)
@@ -37,7 +37,7 @@
#include "OrxonoxPrereqs.h"
#include <climits>
-#include "objects/pickup/UsableItem.h"
+#include "pickup/UsableItem.h"
namespace orxonox
{
Modified: code/branches/libraries2/src/orxonox/pickup/items/Jump.cc
===================================================================
--- code/branches/libraries2/src/orxonox/pickup/items/Jump.cc 2009-08-31 22:14:43 UTC (rev 5734)
+++ code/branches/libraries2/src/orxonox/pickup/items/Jump.cc 2009-08-31 22:38:36 UTC (rev 5735)
@@ -35,8 +35,8 @@
#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
{
Modified: code/branches/libraries2/src/orxonox/pickup/items/Jump.h
===================================================================
--- code/branches/libraries2/src/orxonox/pickup/items/Jump.h 2009-08-31 22:14:43 UTC (rev 5734)
+++ code/branches/libraries2/src/orxonox/pickup/items/Jump.h 2009-08-31 22:38:36 UTC (rev 5735)
@@ -40,7 +40,7 @@
#include <climits>
#include "util/Math.h"
-#include "objects/pickup/UsableItem.h"
+#include "pickup/UsableItem.h"
namespace orxonox
{
Modified: code/branches/libraries2/src/orxonox/sound/SoundBase.cc
===================================================================
--- code/branches/libraries2/src/orxonox/sound/SoundBase.cc 2009-08-31 22:14:43 UTC (rev 5734)
+++ code/branches/libraries2/src/orxonox/sound/SoundBase.cc 2009-08-31 22:38:36 UTC (rev 5735)
@@ -36,7 +36,7 @@
#include "util/Math.h"
#include "core/Core.h"
#include "core/Resource.h"
-#include "objects/worldentities/WorldEntity.h"
+#include "worldentities/WorldEntity.h"
#include "SoundManager.h"
namespace orxonox
Modified: code/branches/libraries2/src/orxonox/sound/SoundManager.cc
===================================================================
--- code/branches/libraries2/src/orxonox/sound/SoundManager.cc 2009-08-31 22:14:43 UTC (rev 5734)
+++ code/branches/libraries2/src/orxonox/sound/SoundManager.cc 2009-08-31 22:38:36 UTC (rev 5735)
@@ -32,7 +32,7 @@
#include "util/Math.h"
#include "CameraManager.h"
-#include "objects/worldentities/Camera.h"
+#include "worldentities/Camera.h"
#include "SoundBase.h"
namespace orxonox
Modified: code/branches/libraries2/src/orxonox/weaponsystem/Weapon.h
===================================================================
--- code/branches/libraries2/src/orxonox/weaponsystem/Weapon.h 2009-08-31 22:14:43 UTC (rev 5734)
+++ code/branches/libraries2/src/orxonox/weaponsystem/Weapon.h 2009-08-31 22:38:36 UTC (rev 5735)
@@ -34,7 +34,7 @@
#include <map>
#include "tools/Timer.h"
-#include "objects/worldentities/StaticEntity.h"
+#include "worldentities/StaticEntity.h"
namespace orxonox
{
Modified: code/branches/libraries2/src/orxonox/weaponsystem/WeaponSlot.h
===================================================================
--- code/branches/libraries2/src/orxonox/weaponsystem/WeaponSlot.h 2009-08-31 22:14:43 UTC (rev 5734)
+++ code/branches/libraries2/src/orxonox/weaponsystem/WeaponSlot.h 2009-08-31 22:38:36 UTC (rev 5735)
@@ -30,7 +30,7 @@
#define _WeaponSlot_H__
#include "OrxonoxPrereqs.h"
-#include "objects/worldentities/StaticEntity.h"
+#include "worldentities/StaticEntity.h"
namespace orxonox
{
Modified: code/branches/libraries2/src/orxonox/weaponsystem/WeaponSystem.cc
===================================================================
--- code/branches/libraries2/src/orxonox/weaponsystem/WeaponSystem.cc 2009-08-31 22:14:43 UTC (rev 5734)
+++ code/branches/libraries2/src/orxonox/weaponsystem/WeaponSystem.cc 2009-08-31 22:38:36 UTC (rev 5735)
@@ -29,7 +29,7 @@
#include "WeaponSystem.h"
#include "core/CoreIncludes.h"
-#include "objects/worldentities/pawns/Pawn.h"
+#include "worldentities/pawns/Pawn.h"
#include "WeaponSlot.h"
#include "WeaponPack.h"
Modified: code/branches/libraries2/src/orxonox/worldentities/Backlight.cc
===================================================================
--- code/branches/libraries2/src/orxonox/worldentities/Backlight.cc 2009-08-31 22:14:43 UTC (rev 5734)
+++ code/branches/libraries2/src/orxonox/worldentities/Backlight.cc 2009-08-31 22:38:36 UTC (rev 5735)
@@ -37,7 +37,7 @@
#include "core/CoreIncludes.h"
#include "core/GameMode.h"
#include "core/XMLPort.h"
-#include "objects/Scene.h"
+#include "Scene.h"
namespace orxonox
{
Modified: code/branches/libraries2/src/orxonox/worldentities/BigExplosion.cc
===================================================================
--- code/branches/libraries2/src/orxonox/worldentities/BigExplosion.cc 2009-08-31 22:14:43 UTC (rev 5734)
+++ code/branches/libraries2/src/orxonox/worldentities/BigExplosion.cc 2009-08-31 22:38:36 UTC (rev 5735)
@@ -36,8 +36,8 @@
#include "core/Executor.h"
#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"
namespace orxonox
Modified: code/branches/libraries2/src/orxonox/worldentities/Billboard.cc
===================================================================
--- code/branches/libraries2/src/orxonox/worldentities/Billboard.cc 2009-08-31 22:14:43 UTC (rev 5734)
+++ code/branches/libraries2/src/orxonox/worldentities/Billboard.cc 2009-08-31 22:38:36 UTC (rev 5735)
@@ -31,7 +31,7 @@
#include "core/CoreIncludes.h"
#include "core/GameMode.h"
#include "core/XMLPort.h"
-#include "objects/Scene.h"
+#include "Scene.h"
namespace orxonox
{
@@ -110,7 +110,7 @@
else
this->billboard_.setColour(this->colour_);
}
-
+
/*
void Billboard::changedRotation()
{
Modified: code/branches/libraries2/src/orxonox/worldentities/Camera.cc
===================================================================
--- code/branches/libraries2/src/orxonox/worldentities/Camera.cc 2009-08-31 22:14:43 UTC (rev 5734)
+++ code/branches/libraries2/src/orxonox/worldentities/Camera.cc 2009-08-31 22:38:36 UTC (rev 5735)
@@ -37,7 +37,7 @@
#include "util/StringUtils.h"
#include "core/CoreIncludes.h"
#include "core/ConfigValueIncludes.h"
-#include "objects/Scene.h"
+#include "Scene.h"
#include "CameraManager.h"
namespace orxonox
Modified: code/branches/libraries2/src/orxonox/worldentities/Camera.h
===================================================================
--- code/branches/libraries2/src/orxonox/worldentities/Camera.h 2009-08-31 22:14:43 UTC (rev 5734)
+++ code/branches/libraries2/src/orxonox/worldentities/Camera.h 2009-08-31 22:38:36 UTC (rev 5735)
@@ -33,7 +33,7 @@
#include "util/OgreForwardRefs.h"
#include "tools/interfaces/Tickable.h"
-#include "objects/worldentities/StaticEntity.h"
+#include "worldentities/StaticEntity.h"
namespace orxonox
{
Modified: code/branches/libraries2/src/orxonox/worldentities/CameraPosition.h
===================================================================
--- code/branches/libraries2/src/orxonox/worldentities/CameraPosition.h 2009-08-31 22:14:43 UTC (rev 5734)
+++ code/branches/libraries2/src/orxonox/worldentities/CameraPosition.h 2009-08-31 22:38:36 UTC (rev 5735)
@@ -30,7 +30,7 @@
#define _CameraPosition_H__
#include "OrxonoxPrereqs.h"
-#include "objects/worldentities/StaticEntity.h"
+#include "worldentities/StaticEntity.h"
namespace orxonox
{
Modified: code/branches/libraries2/src/orxonox/worldentities/ControllableEntity.cc
===================================================================
--- code/branches/libraries2/src/orxonox/worldentities/ControllableEntity.cc 2009-08-31 22:14:43 UTC (rev 5734)
+++ code/branches/libraries2/src/orxonox/worldentities/ControllableEntity.cc 2009-08-31 22:38:36 UTC (rev 5735)
@@ -36,11 +36,11 @@
#include "core/GameMode.h"
#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"
namespace orxonox
@@ -382,8 +382,8 @@
registerVariable(this->client_linear_velocity_, VariableDirection::ToServer, new NetworkCallback<ControllableEntity>(this, &ControllableEntity::processClientLinearVelocity));
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));
}
Modified: code/branches/libraries2/src/orxonox/worldentities/ExplosionChunk.cc
===================================================================
--- code/branches/libraries2/src/orxonox/worldentities/ExplosionChunk.cc 2009-08-31 22:14:43 UTC (rev 5734)
+++ code/branches/libraries2/src/orxonox/worldentities/ExplosionChunk.cc 2009-08-31 22:38:36 UTC (rev 5735)
@@ -32,7 +32,7 @@
#include "core/Executor.h"
#include "core/GameMode.h"
#include "util/Exception.h"
-#include "objects/Scene.h"
+#include "Scene.h"
#include "tools/ParticleInterface.h"
namespace orxonox
Modified: code/branches/libraries2/src/orxonox/worldentities/Light.cc
===================================================================
--- code/branches/libraries2/src/orxonox/worldentities/Light.cc 2009-08-31 22:14:43 UTC (rev 5734)
+++ code/branches/libraries2/src/orxonox/worldentities/Light.cc 2009-08-31 22:38:36 UTC (rev 5735)
@@ -37,7 +37,7 @@
#include "core/CoreIncludes.h"
#include "core/GameMode.h"
#include "core/XMLPort.h"
-#include "objects/Scene.h"
+#include "Scene.h"
namespace orxonox
{
Modified: code/branches/libraries2/src/orxonox/worldentities/MobileEntity.cc
===================================================================
--- code/branches/libraries2/src/orxonox/worldentities/MobileEntity.cc 2009-08-31 22:14:43 UTC (rev 5734)
+++ code/branches/libraries2/src/orxonox/worldentities/MobileEntity.cc 2009-08-31 22:38:36 UTC (rev 5735)
@@ -33,7 +33,7 @@
#include "core/CoreIncludes.h"
#include "core/XMLPort.h"
-#include "objects/Scene.h"
+#include "Scene.h"
namespace orxonox
{
Modified: code/branches/libraries2/src/orxonox/worldentities/Model.cc
===================================================================
--- code/branches/libraries2/src/orxonox/worldentities/Model.cc 2009-08-31 22:14:43 UTC (rev 5734)
+++ code/branches/libraries2/src/orxonox/worldentities/Model.cc 2009-08-31 22:38:36 UTC (rev 5735)
@@ -33,7 +33,7 @@
#include "core/CoreIncludes.h"
#include "core/GameMode.h"
#include "core/XMLPort.h"
-#include "objects/Scene.h"
+#include "Scene.h"
namespace orxonox
{
Modified: code/branches/libraries2/src/orxonox/worldentities/MovableEntity.cc
===================================================================
--- code/branches/libraries2/src/orxonox/worldentities/MovableEntity.cc 2009-08-31 22:14:43 UTC (rev 5734)
+++ code/branches/libraries2/src/orxonox/worldentities/MovableEntity.cc 2009-08-31 22:38:36 UTC (rev 5735)
@@ -33,7 +33,7 @@
#include "core/Executor.h"
#include "core/GameMode.h"
#include "core/XMLPort.h"
-#include "objects/worldentities/pawns/Pawn.h"
+#include "worldentities/pawns/Pawn.h"
namespace orxonox
{
Modified: code/branches/libraries2/src/orxonox/worldentities/ParticleEmitter.cc
===================================================================
--- code/branches/libraries2/src/orxonox/worldentities/ParticleEmitter.cc 2009-08-31 22:14:43 UTC (rev 5734)
+++ code/branches/libraries2/src/orxonox/worldentities/ParticleEmitter.cc 2009-08-31 22:38:36 UTC (rev 5735)
@@ -38,7 +38,7 @@
#include "core/GameMode.h"
#include "core/XMLPort.h"
#include "tools/ParticleInterface.h"
-#include "objects/Scene.h"
+#include "Scene.h"
namespace orxonox
{
Modified: code/branches/libraries2/src/orxonox/worldentities/SpawnPoint.cc
===================================================================
--- code/branches/libraries2/src/orxonox/worldentities/SpawnPoint.cc 2009-08-31 22:14:43 UTC (rev 5734)
+++ code/branches/libraries2/src/orxonox/worldentities/SpawnPoint.cc 2009-08-31 22:38:36 UTC (rev 5735)
@@ -31,8 +31,8 @@
#include "core/CoreIncludes.h"
#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
{
Modified: code/branches/libraries2/src/orxonox/worldentities/SpawnPoint.h
===================================================================
--- code/branches/libraries2/src/orxonox/worldentities/SpawnPoint.h 2009-08-31 22:14:43 UTC (rev 5734)
+++ code/branches/libraries2/src/orxonox/worldentities/SpawnPoint.h 2009-08-31 22:38:36 UTC (rev 5735)
@@ -33,7 +33,7 @@
#include <string>
#include "core/Identifier.h"
-#include "objects/worldentities/StaticEntity.h"
+#include "worldentities/StaticEntity.h"
namespace orxonox
{
Modified: code/branches/libraries2/src/orxonox/worldentities/TeamSpawnPoint.h
===================================================================
--- code/branches/libraries2/src/orxonox/worldentities/TeamSpawnPoint.h 2009-08-31 22:14:43 UTC (rev 5734)
+++ code/branches/libraries2/src/orxonox/worldentities/TeamSpawnPoint.h 2009-08-31 22:38:36 UTC (rev 5735)
@@ -31,7 +31,7 @@
#include "OrxonoxPrereqs.h"
-#include "objects/worldentities/pawns/Pawn.h"
+#include "worldentities/pawns/Pawn.h"
#include "SpawnPoint.h"
namespace orxonox
Modified: code/branches/libraries2/src/orxonox/worldentities/WorldEntity.cc
===================================================================
--- code/branches/libraries2/src/orxonox/worldentities/WorldEntity.cc 2009-08-31 22:14:43 UTC (rev 5734)
+++ code/branches/libraries2/src/orxonox/worldentities/WorldEntity.cc 2009-08-31 22:38:36 UTC (rev 5735)
@@ -43,8 +43,8 @@
#include "util/Exception.h"
#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
{
Modified: code/branches/libraries2/src/orxonox/worldentities/pawns/Destroyer.cc
===================================================================
--- code/branches/libraries2/src/orxonox/worldentities/pawns/Destroyer.cc 2009-08-31 22:14:43 UTC (rev 5734)
+++ code/branches/libraries2/src/orxonox/worldentities/pawns/Destroyer.cc 2009-08-31 22:38:36 UTC (rev 5735)
@@ -29,7 +29,7 @@
#include "Destroyer.h"
#include "core/CoreIncludes.h"
-#include "objects/gametypes/UnderAttack.h"
+#include "gametypes/UnderAttack.h"
namespace orxonox
{
Modified: code/branches/libraries2/src/orxonox/worldentities/pawns/Pawn.cc
===================================================================
--- code/branches/libraries2/src/orxonox/worldentities/pawns/Pawn.cc 2009-08-31 22:14:43 UTC (rev 5734)
+++ code/branches/libraries2/src/orxonox/worldentities/pawns/Pawn.cc 2009-08-31 22:38:36 UTC (rev 5735)
@@ -37,15 +37,15 @@
#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"
namespace orxonox
Modified: code/branches/libraries2/src/orxonox/worldentities/pawns/Pawn.h
===================================================================
--- code/branches/libraries2/src/orxonox/worldentities/pawns/Pawn.h 2009-08-31 22:14:43 UTC (rev 5734)
+++ code/branches/libraries2/src/orxonox/worldentities/pawns/Pawn.h 2009-08-31 22:38:36 UTC (rev 5735)
@@ -33,8 +33,8 @@
#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
{
@@ -113,7 +113,7 @@
{ return this->pickups_; }
virtual void useItem()
{ this->pickups_.useItem(); }
-
+
virtual void startLocalHumanControl();
protected:
Modified: code/branches/libraries2/src/orxonox/worldentities/pawns/SpaceShip.cc
===================================================================
--- code/branches/libraries2/src/orxonox/worldentities/pawns/SpaceShip.cc 2009-08-31 22:14:43 UTC (rev 5734)
+++ code/branches/libraries2/src/orxonox/worldentities/pawns/SpaceShip.cc 2009-08-31 22:38:36 UTC (rev 5735)
@@ -34,7 +34,7 @@
#include "core/ConfigValueIncludes.h"
#include "core/Template.h"
#include "core/XMLPort.h"
-#include "objects/items/Engine.h"
+#include "items/Engine.h"
namespace orxonox
{
Modified: code/branches/libraries2/src/orxonox/worldentities/pawns/Spectator.cc
===================================================================
--- code/branches/libraries2/src/orxonox/worldentities/pawns/Spectator.cc 2009-08-31 22:14:43 UTC (rev 5734)
+++ code/branches/libraries2/src/orxonox/worldentities/pawns/Spectator.cc 2009-08-31 22:38:36 UTC (rev 5735)
@@ -33,8 +33,8 @@
#include "core/GameMode.h"
#include "tools/BillboardSet.h"
-#include "objects/Scene.h"
-#include "objects/infos/PlayerInfo.h"
+#include "Scene.h"
+#include "infos/PlayerInfo.h"
namespace orxonox
{
Modified: code/branches/libraries2/src/orxonox/worldentities/pawns/Spectator.h
===================================================================
--- code/branches/libraries2/src/orxonox/worldentities/pawns/Spectator.h 2009-08-31 22:14:43 UTC (rev 5734)
+++ code/branches/libraries2/src/orxonox/worldentities/pawns/Spectator.h 2009-08-31 22:38:36 UTC (rev 5735)
@@ -32,7 +32,7 @@
#include "OrxonoxPrereqs.h"
#include "util/Math.h"
-#include "objects/worldentities/ControllableEntity.h"
+#include "worldentities/ControllableEntity.h"
namespace orxonox
{
Modified: code/branches/libraries2/src/orxonox/worldentities/pawns/TeamBaseMatchBase.cc
===================================================================
--- code/branches/libraries2/src/orxonox/worldentities/pawns/TeamBaseMatchBase.cc 2009-08-31 22:14:43 UTC (rev 5734)
+++ code/branches/libraries2/src/orxonox/worldentities/pawns/TeamBaseMatchBase.cc 2009-08-31 22:38:36 UTC (rev 5735)
@@ -32,7 +32,7 @@
#include "core/CoreIncludes.h"
#include "interfaces/PawnListener.h"
#include "interfaces/TeamColourable.h"
-#include "objects/gametypes/TeamBaseMatch.h"
+#include "gametypes/TeamBaseMatch.h"
namespace orxonox
{
More information about the Orxonox-commit
mailing list