Changeset 10772 in orxonox.OLD for branches/presentation/src/world_entities/weapons/weapon.h

Timestamp:

Jul 2, 2007, 3:57:53 PM (17 years ago)

Author:

nicolasc

Message:

some minor cleanup

File:

• branches/presentation/src/world_entities/weapons/weapon.h (modified) (5 diffs)

branches/presentation/src/world_entities/weapons/weapon.h

@@ -193 +193 @@
 
     Animation3D* getShootAnim(int barrel, int seg) { return this->shootAnim[barrel][seg]; };
-//     void setShootAnim(int barrel, int seg, PNode* component) { this->shootAnim[barrel][seg] = this->getAnimation(barrel, seg, component); };
-
-//     void init2();
-//     void deconstr();
 
     inline int getPreferedSide() { return this->preferedSide; }
@@ -203 +199 @@
     inline void setEnergyWidgetInitialized(bool b) {this->isEnergyWidgetInitialized = b;};
 
+    //some functions for conveneance
     inline const Vector& getObjComp(int barrel, int seg) const { return this->objComp[barrel][seg]->getAbsCoor(); };
     inline const float getObjCompx(int barrel, int seg) const { return this->objComp[barrel][seg]->getAbsCoor().x; };
@@ -259 +256 @@
     float                maxCharge;                        //!< The maximal energy to be loaded onto one projectile (this is only availible if chargeable is enabled)
 
-    //OrxGui::GLGuiEnergyWidgetVertical* energyWidget;
-
     PNode*               defaultTarget;                    //!< A target for targeting Weapons.
 
@@ -277 +272 @@
     OrxSound::SoundBuffer  soundBuffers[WA_ACTION_COUNT];   //!< SoundBuffers for all actions @see WeaponAction.
 
-    PNode*                 emissionPoint[MAX_BARRELS];                   //!< The point, where the projectiles are emitted. (this is coppled with the Weapon by default)
+    PNode*                 emissionPoint[MAX_BARRELS];      //!< The point, where the projectiles are emitted.
 
     bool                   hideInactive;                    //!< Hides the Weapon if it is inactive
@@ -287 +282 @@
     int                    barrels;                         //!< # of barrels (max 4)
     int                    segs;                            //!< # of segments, one barrel has (max 3)
-    int                    activeBarrel;
+    int                    activeBarrel;                    //!< set # of active barrel, count array wise (aka. 0 is the first)
     Animation3D*           shootAnim[MAX_BARRELS][MAX_SEGMENTS];
     PNode*                 objComp[MAX_BARRELS][MAX_SEGMENTS];