Changeset 10934 for code/branches/campaignHS15/src/orxonox

Timestamp:

Dec 7, 2015, 2:49:46 PM (9 years ago)

Author:

gania

Message:

fixed bugs that are not supposed to even exist by initializing a variable in the constructor

Location:

code/branches/campaignHS15/src/orxonox/controllers

Files:

• ActionpointController.cc (modified) (7 diffs)
• ActionpointController.h (modified) (1 diff)
• FightingController.cc (modified) (1 diff)
• FightingController.h (modified) (1 diff)

code/branches/campaignHS15/src/orxonox/controllers/ActionpointController.cc

@@ -40 +40 @@
     ActionpointController::ActionpointController(Context* context) : FightingController(context)
     {
+        this->actionpointControllerId_ = 0;
+        ActionpointController::sTicks_ = 0;
+        ActionpointController::nextActionpointControllerId_ = 0;
         this->ticks_ = 0;
         this->bPatrolling_ = false;
@@ -48 +51 @@
         parsedActionpoints_.clear();
         actionpoints_.clear();
-
         this->bTakenOver_ = false;
         this->action_ = Action::NONE;
@@ -92 +94 @@
         parsedActionpoints_.clear();
         actionpoints_.clear();
-        ActionpointController::nextActionpointControllerId_--;
+        this->actionpointControllerId_ = 0;
+        /*ActionpointController::nextActionpointControllerId_--;
         if (ActionpointController::nextActionpointControllerId_ < 0)
-            ActionpointController::nextActionpointControllerId_ = 0;
+            ActionpointController::nextActionpointControllerId_ = 0;*/
     }
     void ActionpointController::tick(float dt)
@@ -121 +124 @@
                 this->action_ = Action::FIGHTALL;
             }
+            //orxout (internal_error) << "first tick was called by id = " << this->actionpointControllerId_ << ", total = " << ActionpointController::nextActionpointControllerId_ << endl;
         }
         if (ActionpointController::sTicks_ == 1)
         {    
-            this->timeOffset_ = 0.0f;
             this->bActionCalled_ = false;
             
@@ -152 +155 @@
             return;
         
-        this->timeOffset_ += dt;
-        if (this->timeOffset_ >= 2.4f)
-            this->timeOffset_ = 0.0f;
+
         if (timeout_ <= 0)
             this->bFiredRocket_ = false;
@@ -163 +164 @@
         if (this->timeout_ > 0 && this->bFiredRocket_)
         {
-            this->timeout_ -= dt;
+            --this->timeout_;
         }
    
@@ -188 +189 @@
         if (!this || !this->getControllableEntity())
             return;
-
-        if (this->hasTarget() &&  ActionpointController::sTicks_ % (ActionpointController::nextActionpointControllerId_ + 1) == (this->actionpointControllerId_))
+       /* orxout (internal_error) << "id = " << this->actionpointControllerId_ << ", in total # ids = " << ActionpointController::nextActionpointControllerId_ 
+        << ", I " << (this->hasTarget() ? "have" : "don't have") << " a target, my team is " << this->getControllableEntity()->getTeam() << endl;
+       */ if (this->hasTarget() &&  ActionpointController::sTicks_ % (ActionpointController::nextActionpointControllerId_ + 1) == (this->actionpointControllerId_))
         {
 

code/branches/campaignHS15/src/orxonox/controllers/ActionpointController.h

@@ -252 +252 @@
                 std::multimap <int, std::pair<PickupSpawner*, bool> > speedSpawners_; 
 */
-                float timeOffset_;
                 bool bActionCalled_;
                 bool bManeuverCalled_;

code/branches/campaignHS15/src/orxonox/controllers/FightingController.cc

@@ -336 +336 @@
         if (firemode == getFiremode("RocketFire"))
         {
-            this->timeout_ = 0.5f;
+            this->timeout_ = 5;
             this->rocketsLeft_--;
             this->bFiredRocket_ = true;

code/branches/campaignHS15/src/orxonox/controllers/FightingController.h

@@ -91 +91 @@
             //WEAPONSYSTEM DATA
             int rocketsLeft_;
-            float timeout_;
+            int timeout_;
             bool bFiredRocket_;
             std::map<std::string, int> weaponModes_; //<! Links each "weapon" to it's weaponmode - managed by setupWeapons()