Changeset 4910 in orxonox.OLD

Timestamp:

Jul 20, 2005, 11:26:16 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: flush

Location:

orxonox/trunk/src/world_entities

Files:

• player.cc (modified) (1 diff)
• weapons/test_gun.cc (modified) (1 diff)
• weapons/weapon.cc (modified) (7 diffs)
• weapons/weapon.h (modified) (3 diffs)

orxonox/trunk/src/world_entities/player.cc

@@ -50 +50 @@
 
   this->weaponMan->addWeapon(wpRight, WM_CONFIG0, WM_SLOT0);
-  this->weaponMan->addWeapon(wpLeft, WM_CONFIG1, WM_SLOT1);
-  this->weaponMan->addWeapon(wpRight, WM_CONFIG2);
-  this->weaponMan->addWeapon(wpLeft, WM_CONFIG2);
+//  this->weaponMan->addWeapon(wpLeft, WM_CONFIG1, WM_SLOT1);
+//  this->weaponMan->addWeapon(wpRight, WM_CONFIG2);
+//  this->weaponMan->addWeapon(wpLeft, WM_CONFIG2);
 }
 

orxonox/trunk/src/world_entities/weapons/test_gun.cc

@@ -102 +102 @@
   this->setStateDuration(WS_SHOOTING, .4);
   this->setStateDuration(WS_RELOADING, 1);
-  //this->setStateDuration(WS_ACTIVATING, .4);
-  //this->setStateDuration(WS_DEACTIVATING, .4);
+  this->setStateDuration(WS_ACTIVATING, .4);
+  this->setStateDuration(WS_DEACTIVATING, .4);
 
   this->energy = 100;

orxonox/trunk/src/world_entities/weapons/weapon.cc

@@ -266 +266 @@
     // setting up for next action
     this->currentState = WS_ACTIVATING;
-    this->stateDuration = this->times[WA_ACTIVATE] + this->stateDuration;
+    this->stateDuration = this->times[WS_ACTIVATING] + this->stateDuration;
   }
   this->requestedAction = WA_NONE;
@@ -290 +290 @@
         // setting up for next action
     this->currentState = WS_DEACTIVATING;
-    this->stateDuration = this->times[WA_DEACTIVATE] + this->stateDuration;
+    this->stateDuration = this->times[WS_DEACTIVATING] + this->stateDuration;
   }
   this->requestedAction = WA_NONE;
@@ -314 +314 @@
     this->requestedAction = WA_NONE;
     this->currentState = WS_CHARGING;
-    this->stateDuration = this->times[WA_CHARGE] + this->stateDuration;
+    this->stateDuration = this->times[WS_CHARGING] + this->stateDuration;
   }
   else // deactivate the Weapon if we do not have enough energy
@@ -342 +342 @@
     this->energyLoaded -= this->minCharge;
           // setting up for the next state
-    this->stateDuration = this->times[WA_SHOOT] + this->stateDuration;
+    this->stateDuration = this->times[WS_SHOOTING] + this->stateDuration;
     this->currentState = WS_SHOOTING;
     this->requestedAction = WA_NONE;
@@ -390 +390 @@
   this->requestedAction = WA_NONE;
   this->currentState = WS_RELOADING;
-  this->stateDuration = this->times[WA_RELOAD] + this->stateDuration;
+  this->stateDuration = this->times[WS_RELOADING] + this->stateDuration;
 
 }
@@ -400 +400 @@
 void Weapon::tickW(float dt)
 {
+  printf("%s ", stateToChar(this->currentState));
+
   // setting up the timing properties
   this->stateDuration -= dt;
@@ -407 +409 @@
     if (this->stateDuration <= 0.0)
     {
-      if (unlikely (this->currentState != WS_DEACTIVATING))
+      if (unlikely (this->currentState == WS_DEACTIVATING))
+      {
+        this->currentState = WS_INACTIVE;
+        return;
+      }
+      else
         this->currentState = WS_IDLE;
-      else
-        this->currentState = WS_INACTIVE;
 
       if (this->requestedAction != WA_NONE)

orxonox/trunk/src/world_entities/weapons/weapon.h

@@ -157 +157 @@
 
   protected:
-    SoundSource*         soundSource;                      //!< A SoundSource to play sound from (this is connected to the PNode of the Weapon)
     // it is all about energy
     float                energy;                           //!< The energy stored in the weapons secondary buffers (reserve)
@@ -163 +162 @@
     float                energyMax;                        //!< The maximal energy that can be stored in the secondary buffers (reserveMax)
     float                energyLoadedMax;                  //!< The maximal energy that can be stored in the primary buffers
+    //! @todo move this to projectile
     float                minCharge;                        //!< The minimal energy to be loaded onto one projectile if chargeable otherwise the power consumed by one projectile
     float                maxCharge;                        //!< The maximal energy to be loaded onto one projectile (this is only availible if chargeable is enabled)
@@ -170 +170 @@
     ////////////
   private:
+    SoundSource*         soundSource;                      //!< A SoundSource to play sound from (this is connected to the PNode of the Weapon)
+
     WeaponState          currentState;                     //!< The State the weapon is in.
     WeaponAction         requestedAction;                  //!< An action to try to Engage after the currentState ends.