Changeset 8954 for code/branches

Timestamp:

Nov 30, 2011, 4:17:00 PM (13 years ago)

Author:

eceline

Message:

DistanceMultiTrigger

Location:

code/branches/spaceraceTwo/src/modules

Files:

• gametypes/RaceCheckPoint.cc (modified) (5 diffs)
• gametypes/RaceCheckPoint.h (modified) (3 diffs)
• gametypes/SpaceRace.cc (modified) (1 diff)
• objects/triggers/DistanceMultiTrigger.h (modified) (1 diff)
• objects/triggers/MultiTrigger.h (modified) (1 diff)

code/branches/spaceraceTwo/src/modules/gametypes/RaceCheckPoint.cc

@@ -40 +40 @@
     CreateFactory(RaceCheckPoint);
     
-      
+     
 
-    RaceCheckPoint::RaceCheckPoint(BaseObject* creator): DistanceTrigger(creator), RadarViewable(creator, static_cast<WorldEntity*>(this))
+    RaceCheckPoint::RaceCheckPoint(BaseObject* creator): DistanceMultiTrigger(creator), RadarViewable(creator, static_cast<WorldEntity*>(this))
     {
         RegisterObject(RaceCheckPoint);
-        
+        this->setDistance(100);
+        this->setBeaconMode("off");
+        this->setBroadcast(false);
+        this->setSimultaneousTriggerers(100);
         
            
@@ -56 +59 @@
         this->setRadarObjectShape(RadarViewable::Triangle);
         this->setRadarVisibility(true);
+    
+    //this->addTarget("WorldEntity");
+    
+    
     }
+    
 
-    RaceCheckPoint::~RaceCheckPoint()
+   RaceCheckPoint::~RaceCheckPoint()
     {
-         //if (this->isInitialized())
+    
+         if (this->isInitialized())
         {
             //for (size_t i = 0; i < 3; ++i)
@@ -76 +85 @@
         if(this->isVisible_){this->setRadarVisibility(true);}
         else{this->setRadarVisibility(false);}
-       
+        
+      
+      
        
         /*this->setRadarVisibility(false);
@@ -103 +114 @@
     }
 
-        void RaceCheckPoint::triggered(bool bIsTriggered, PlayerInfo* player)
+        void RaceCheckPoint::fire(bool bIsTriggered,BaseObject* player)
     {
-        DistanceTrigger::triggered(bIsTriggered);
+        
+        //bool b= bIsTriggered;
+        //PlayerInfo* pl= player;
+        DistanceMultiTrigger::fire((bool)bIsTriggered,player);
+        
+   //SUPER(RaceCheckPoint,fire,bIsTriggered,player);
+                
 
         SpaceRace* gametype = orxonox_cast<SpaceRace*>(this->getGametype().get());
         assert(gametype);
-        if (gametype && this->getCheckpointIndex() == gametype->getCheckpointReached(player) && bIsTriggered)
+        
+                 PlayerInfo* player2 = (PlayerInfo*)player;
+        assert(player2);
+                //DistanceMultiTrigger::fire(bIsTriggered,player);
+                
+                
+                
+       
+                
+        if (gametype && this->getCheckpointIndex() == gametype->getCheckpointReached(player2) && bIsTriggered)
         {
             gametype->clock_.capture();
@@ -122 +148 @@
             else
             {
-                gametype->newCheckpointReached(this,player);
+                gametype->newCheckpointReached(this,player2);
                 this->setRadarObjectColour(ColourValue::Green); //sets the radar colour of the checkpoint to green if it is reached, else it is red.
             }

code/branches/spaceraceTwo/src/modules/gametypes/RaceCheckPoint.h

@@ -32 +32 @@
 #include "gametypes/GametypesPrereqs.h"
 
-#include "objects/triggers/DistanceTrigger.h"
+#include "objects/triggers/DistanceMultiTrigger.h"
 #include "interfaces/RadarViewable.h"
 
@@ -42 +42 @@
         !!! Don't forget to control the indexes of your check points and to set one last check point!!!
     */
-    class _GametypesExport RaceCheckPoint : public DistanceTrigger, public RadarViewable
+    class _GametypesExport RaceCheckPoint : public DistanceMultiTrigger, public RadarViewable
     {
         public:
@@ -65 +65 @@
                 {this->isVisible_ = b;}
         protected:
-            virtual void triggered(bool bIsTriggered, PlayerInfo* player);
+            virtual void fire(bool bIsTriggered,BaseObject* player);
             inline void setLast(bool isLast)
                 { this->bIsLast_ = isLast; }

code/branches/spaceraceTwo/src/modules/gametypes/SpaceRace.cc

@@ -117 +117 @@
                                
                                this->addBots(this->numberOfBots_); 
+                               
       
     }

code/branches/spaceraceTwo/src/modules/objects/triggers/DistanceMultiTrigger.h

@@ -91 +91 @@
     @ingroup MultiTrigger
     */
-    class _ObjectsExport DistanceMultiTrigger : public MultiTrigger
+    class _ObjectsExport DistanceMultiTrigger : public MultiTrigger 
     {
 

code/branches/spaceraceTwo/src/modules/objects/triggers/MultiTrigger.h

@@ -157 +157 @@
             bool isTriggered(BaseObject* triggerer = NULL); //!< Get whether the MultiTrigger is triggered for a given object.
 
-            void fire(bool status, BaseObject* originator = NULL);  //!< Helper method. Creates an Event for the given status and originator and fires it.
+            virtual void fire(bool status, BaseObject* originator = NULL);  //!< Helper method. Creates an Event for the given status and originator and fires it.
             void broadcast(bool status); //!< Helper method. Broadcasts an Event for every object that is a target.