Changeset 9869 in orxonox.OLD for trunk/src/world_entities/weapons/weapon.h

Timestamp:

Oct 3, 2006, 12:19:30 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the new_class_id branche back to the trunk.
merged with command:
svn merge ​https://svn.orxonox.net/orxonox/branches/new_class_id trunk -r9683:HEAD
no conflicts… puh..

File:

• trunk/src/world_entities/weapons/weapon.h (modified) (4 diffs)

trunk/src/world_entities/weapons/weapon.h

@@ -19 +19 @@
 #include "ammo_container.h"
 
+#include "sound_buffer.h"
+
 // FORWARD DECLARATION
 class Projectile;
@@ -83 +85 @@
 class Weapon : public WorldEntity
 {
+  ObjectListDeclaration(Weapon);
+
   public:
     // INITIALISATION //
     Weapon ();
     virtual ~Weapon ();
-    static Weapon* createWeapon(ClassID weaponID);
+    static Weapon* createWeapon(const ClassID& weaponID);
+    static Weapon* createWeapon(const std::string& weaponName);
 
     void init();
@@ -110 +115 @@
     /** @returns the Capabilities of this Weapon */
     inline long getCapability() const { return this->capability; };
-    void setProjectileType(ClassID projectile);
+    void setProjectileType(const ClassID& projectile);
     void setProjectileTypeC(const std::string& projectile);
     /** @returns The projectile's classID */
@@ -216 +221 @@
     // PHASES //
     ////////////
-    OrxSound::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.
-    float                  stateDuration;                    //!< how long the state has taken until now.
-    float                  times[WS_STATE_COUNT];            //!< Times to stay in the different States @see WeaponState.
-    Animation3D*           animation[WS_STATE_COUNT];        //!< Animations for all the States (you can say yourself on what part of the gun this animation acts).
-    OrxSound::SoundBuffer* soundBuffers[WA_ACTION_COUNT];    //!< SoundBuffers for all actions @see WeaponAction.
+    OrxSound::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.
+    float                  stateDuration;                   //!< how long the state has taken until now.
+    float                  times[WS_STATE_COUNT];           //!< Times to stay in the different States @see WeaponState.
+    Animation3D*           animation[WS_STATE_COUNT];       //!< Animations for all the States (you can say yourself on what part of the gun this animation acts).
+    OrxSound::SoundBuffer  soundBuffers[WA_ACTION_COUNT];   //!< SoundBuffers for all actions @see WeaponAction.
 
     PNode                  emissionPoint;                   //!< The point, where the projectiles are emitted. (this is coppled with the Weapon by default)