Changeset 4930 in orxonox.OLD for orxonox/trunk/src/world_entities

Timestamp:

Jul 22, 2005, 2:11:21 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: adapted the Factory algorithm to ObjectManager… still a logn way to go…

Location:

orxonox/trunk/src/world_entities/weapons

Files:

• test_gun.cc (modified) (1 diff)
• weapon.cc (modified) (4 diffs)
• weapon.h (modified) (2 diffs)
• weapon_manager.h (modified) (1 diff)

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

@@ -105 +105 @@
   this->setStateDuration(WS_DEACTIVATING, .4);
 
+  this->setMaximumEnergy(1000, 10);
   this->increaseEnergy(100);
   //this->minCharge = 2;

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

@@ -88 +88 @@
 
   this->energyLoaded = .0;
-  this->energyLoadedMax = 10.0;
+  this->energyLoadedMax = 5.0;
   this->energy = .0;
-  this->energyMax = 100.0;
+  this->energyMax = 10.0;
 }
 
@@ -112 +112 @@
   if (action >= WA_ACTION_COUNT)
     return;
+  if (this->soundBuffers[action] != NULL)
+    ResourceManager::getInstance()->unload(this->soundBuffers[action]);
+
   else if (soundFile != NULL)
   {
@@ -330 +333 @@
   {
     this->requestAction(WA_RELOAD);
+    this->execute();
   }
 }
@@ -344 +348 @@
   {
     this->requestAction(WA_DEACTIVATE);
+    this->execute();
     return false;
   }

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

@@ -110 +110 @@
 
     /** @param energyMax the maximum energy the Weapon can have @param energyLoadedMax the maximum energy in the weapon buffers */
-    inline void setMaximumEnergy(float energyMax, float energyLoadedMax = 0.0) { this->energyMax = energyMax; this->energyLoadedMax = energyLoadedMax; };
+    inline void setMaximumEnergy(float energyMax, float energyLoadedMax) { this->energyMax = energyMax; this->energyLoadedMax = energyLoadedMax; };
 
     void setActionSound(WeaponAction action, const char* soundFile);
@@ -185 +185 @@
 
     bool                 hideInactive;                    //!< Hides the Weapon if it is inactive
-    bool                 chargeable;                      //!< if the Weapon is charcheable
+    bool                 chargeable;                      //!< if the Weapon is charcheable (if true, the weapon will charge before it fires.)
 
     Projectile*          projectile;                      //!< the projectile used for this weapon

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

@@ -104 +104 @@
     int                     currConfID;              //<! the currently selected config
     weaponConfig            configs[4];              //<! a list of four configurations
-
 };