Changeset 8733 for code/branches

Timestamp:

Jul 5, 2011, 11:59:37 PM (13 years ago)

Author:

jo

Message:

Further narrowing down. The bug is triggered, when a bot calls fire(3) - whenever a bot launches a rocket.

Location:

code/branches/ai2/src

Files:

• modules/weapons/projectiles/Rocket.cc (modified) (2 diffs)
• orxonox/controllers/AIController.cc (modified) (2 diffs)
• orxonox/controllers/ArtificialController.cc (modified) (2 diffs)
• orxonox/worldentities/ControllableEntity.cc (modified) (1 diff)
• orxonox/worldentities/ControllableEntity.h (modified) (2 diffs)

code/branches/ai2/src/modules/weapons/projectiles/Rocket.cc

@@ -58 +58 @@
         this->localAngularVelocity_ = 0;
         this->lifetime_ = 100;
-        this->bIsRocket=true;
+        this->bIsRocket_= true;
 
         if (GameMode::isMaster())
@@ -117 +117 @@
         if(this->isInitialized())
         {
-            this->bIsRocket=false;
+            this->bIsRocket_= false;
             if (GameMode::isMaster())
             {

code/branches/ai2/src/orxonox/controllers/AIController.cc

@@ -230 +230 @@
                         this->moveToTargetPosition();
 
-                    if (this->getControllableEntity() && this->bShooting_ && this->isCloseAtTarget(1000) && this->isLookingAtTarget(math::pi / 20.0f))
-                        this->getControllableEntity()->fire(0);
+                    this->doFire();
                 }
 
@@ -267 +266 @@
                     this->moveToTargetPosition();
 
-                if (this->getControllableEntity() && this->bShooting_ && this->isCloseAtTarget(1000) && this->isLookingAtTarget(math::pi / 20.0f))
-                    this->getControllableEntity()->fire(0);
+                this->doFire();
             }
         }//END_OF DEFAULT MODE

code/branches/ai2/src/orxonox/controllers/ArtificialController.cc

@@ -1049 +1049 @@
             else if((weapons[3]==3)&& this->isCloseAtTarget(400) /*&&projectiles[3]*/ )
             {//ROCKET: mid range weapon
-                //TODO: Which weapon is the rocket? How many rockets are available?
+                //TODO: How many rockets are available?
                 this->mode_ = ROCKET;//Vector-implementation: mode_.push_back(ROCKET);
-                this->getControllableEntity()->fire(3);//launch rocket
+                this->getControllableEntity()->fire(3);//launch rocket BUG IS TRIGGERED HERE.
                 if(this->getControllableEntity()&&this->target_)//after fire(3) getControllableEntity() refers to the rocket!
                 {
@@ -1081 +1081 @@
                 for(unsigned int i=0; i<WeaponSystem::MAX_WEAPON_MODES; i++)
                 {
-                    const std::string wpn = getWeaponname(i, pawn); COUT(0)<<wpn<< std::endl;//Temporary debug info.
+                    //const std::string wpn = getWeaponname(i, pawn); COUT(0)<<wpn<< std::endl;//Temporary debug info.
                     /*if(wpn=="")
                         weapons[i]=-1;

code/branches/ai2/src/orxonox/worldentities/ControllableEntity.cc

@@ -74 +74 @@
         this->bMouseLook_ = false;
         this->mouseLookSpeed_ = 200;
+        this->bIsRocket_ = false;
 
         this->server_position_         = Vector3::ZERO;

code/branches/ai2/src/orxonox/worldentities/ControllableEntity.h

@@ -164 +164 @@
             void setTargetInternal( uint32_t targetID );
             inline bool getRocket() const
-                { return this-> bIsRocket; }
+                { return this-> bIsRocket_; }
 
         protected:
@@ -183 +183 @@
 
             Ogre::SceneNode* cameraPositionRootNode_;
-            bool bIsRocket; //Workaround to see, if the controllable entity is a Rocket.
+            bool bIsRocket_; //Workaround to see, if the controllable entity is a Rocket.
 
         private: