Changeset 3186 for code/branches/pch/src/orxonox/objects/worldentities/triggers

Timestamp:

Jun 16, 2009, 2:25:05 PM (16 years ago)

Author:

rgrieder

Message:

Last part of the cleanup: world entities.

Location:

code/branches/pch/src/orxonox/objects/worldentities/triggers

Files:

• CheckPoint.cc (modified) (1 diff)
• CheckPoint.h (modified) (1 diff)
• DistanceTrigger.cc (modified) (1 diff)
• DistanceTrigger.h (modified) (1 diff)
• EventTrigger.h (modified) (1 diff)
• PlayerTrigger.cc (modified) (1 diff)
• PlayerTrigger.h (modified) (1 diff)
• Trigger.cc (modified) (1 diff)
• Trigger.h (modified) (1 diff)

code/branches/pch/src/orxonox/objects/worldentities/triggers/CheckPoint.cc

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

code/branches/pch/src/orxonox/objects/worldentities/triggers/CheckPoint.h

@@ -35 +35 @@
 #define _CheckPoint_H__
 
+#include "OrxonoxPrereqs.h"
+
+#include "interfaces/RadarViewable.h"
 #include "DistanceTrigger.h"
-#include "interfaces/RadarViewable.h"
 
 namespace orxonox

code/branches/pch/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc

@@ -29 +29 @@
 #include "DistanceTrigger.h"
 
-#include <OgreNode.h>
-
 #include "core/CoreIncludes.h"
 #include "core/XMLPort.h"
-
 #include "orxonox/objects/worldentities/pawns/Pawn.h"
 

code/branches/pch/src/orxonox/objects/worldentities/triggers/DistanceTrigger.h

@@ -30 +30 @@
 #define _DistanceTrigger_H__
 
-#include "PlayerTrigger.h"
+#include "OrxonoxPrereqs.h"
 
 #include <set>
-
 #include "core/ClassTreeMask.h"
-#include "core/BaseObject.h"
-
-#include "orxonox/objects/worldentities/ControllableEntity.h"
+#include "PlayerTrigger.h"
 
 namespace orxonox

code/branches/pch/src/orxonox/objects/worldentities/triggers/EventTrigger.h

@@ -30 +30 @@
 #define _EventTrigger_H__
 
+#include "OrxonoxPrereqs.h"
 #include "Trigger.h"
-
-#include "core/ClassTreeMask.h"
-#include "core/BaseObject.h"
 
 namespace orxonox

code/branches/pch/src/orxonox/objects/worldentities/triggers/PlayerTrigger.cc

@@ -34 +34 @@
 
 #include "PlayerTrigger.h"
-
 #include "core/CoreIncludes.h"
 

code/branches/pch/src/orxonox/objects/worldentities/triggers/PlayerTrigger.h

@@ -37 +37 @@
 
 #include "OrxonoxPrereqs.h"
-
 #include "Trigger.h"
 

code/branches/pch/src/orxonox/objects/worldentities/triggers/Trigger.cc

@@ -29 +29 @@
 #include "Trigger.h"
 
-#include <OgreBillboard.h>
 #include <OgreBillboardSet.h>
+
 #include "core/CoreIncludes.h"
 #include "core/ConsoleCommand.h"
+#include "core/GameMode.h"
 #include "core/XMLPort.h"
-#include "core/GameMode.h"
 #include "objects/Scene.h"
 

code/branches/pch/src/orxonox/objects/worldentities/triggers/Trigger.h

@@ -30 +30 @@
 #define _Trigger_H__
 
+#include "OrxonoxPrereqs.h"
+
 #include <set>
 #include <queue>
 
-#include "OrxonoxPrereqs.h"
-
+#include "tools/BillboardSet.h"
 #include "interfaces/Tickable.h"
 #include "objects/worldentities/StaticEntity.h"
-#include "tools/BillboardSet.h"
 
 namespace orxonox