Changeset 3196 for code/trunk/src/orxonox/objects/worldentities/triggers

Timestamp:

Jun 20, 2009, 9:20:47 AM (16 years ago)

Author:

rgrieder

Message:

Merged pch branch back to trunk.

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/orxonox/objects/worldentities/triggers/CheckPoint.cc (modified) (1 diff)
• src/orxonox/objects/worldentities/triggers/CheckPoint.h (modified) (1 diff)
• src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc (modified) (1 diff)
• src/orxonox/objects/worldentities/triggers/DistanceTrigger.h (modified) (1 diff)
• src/orxonox/objects/worldentities/triggers/EventTrigger.cc (modified) (1 diff)
• src/orxonox/objects/worldentities/triggers/EventTrigger.h (modified) (1 diff)
• src/orxonox/objects/worldentities/triggers/PlayerTrigger.cc (modified) (1 diff)
• src/orxonox/objects/worldentities/triggers/PlayerTrigger.h (modified) (1 diff)
• src/orxonox/objects/worldentities/triggers/Trigger.cc (modified) (2 diffs)
• src/orxonox/objects/worldentities/triggers/Trigger.h (modified) (1 diff)

code/trunk/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/trunk/src/orxonox/objects/worldentities/triggers/CheckPoint.h

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

code/trunk/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/trunk/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/trunk/src/orxonox/objects/worldentities/triggers/EventTrigger.cc

@@ -51 +51 @@
         SUPER(EventTrigger, processEvent, event);
 
-        SetEvent(EventTrigger, "trigger", trigger, event);
+        ORXONOX_SET_EVENT(EventTrigger, "trigger", trigger, event);
     }
 

code/trunk/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/trunk/src/orxonox/objects/worldentities/triggers/PlayerTrigger.cc

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

code/trunk/src/orxonox/objects/worldentities/triggers/PlayerTrigger.h

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

code/trunk/src/orxonox/objects/worldentities/triggers/Trigger.cc

@@ -29 +29 @@
 #include "Trigger.h"
 
-#include <OgreBillboard.h>
-#include <OgreBillboardSet.h>
-#include "util/Debug.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"
 
@@ -237 +234 @@
   {
     if (( (this->latestState_ & 2) && this->bStayActive_ && (this->remainingActivations_ <= 0))
-     || (!(this->latestState_ & 2))                      && (this->remainingActivations_ == 0))
+     || (!(this->latestState_ & 2)                       && (this->remainingActivations_ == 0)))
       return false;
     else

code/trunk/src/orxonox/objects/worldentities/triggers/Trigger.h

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