Changeset 1494 for code/branches/network/src/orxonox/objects/weapon

Timestamp:

May 31, 2008, 11:24:44 PM (17 years ago)

Author:

rgrieder

Message:

• set the svn:eol-style property to all files so, that where ever you check out, you'll get the right line endings (had to change every file with mixed endings to windows in order to set the property)

Location:

code/branches/network/src/orxonox/objects/weapon

Files:

• AmmunitionDump.cc (modified) (1 prop)
• AmmunitionDump.h (modified) (1 prop)
• BarrelGun.cc (modified) (1 prop)
• BarrelGun.h (modified) (1 prop)
• BaseWeapon.cc (modified) (1 prop)
• BaseWeapon.h (modified) (2 diffs, 1 prop)
• Bullet.cc (modified) (1 prop)
• Bullet.h (modified) (1 prop)
• BulletManager.cc (modified) (1 prop)
• BulletManager.h (modified) (1 prop)
• WeaponStation.cc (modified) (1 prop)
• WeaponStation.h (modified) (1 prop)

code/branches/network/src/orxonox/objects/weapon/BaseWeapon.h

@@ -1 +1 @@
 /*
  *   ORXONOX - the hottest 3D action shooter ever to exist
- *                    > www.orxonox.net <
- *
+ *                    > www.orxonox.net < *
  *
  *   License notice:
@@ -26 +25 @@
  *
  */
-
-
-#ifndef _BaseWeapon_H__
-#define _BaseWeapon_H__
-
-#include "OrxonoxPrereqs.h"
-
-#include <OgrePrerequisites.h>
-
-#include "../Model.h"
-
-
-namespace orxonox {
-  class _OrxonoxExport BaseWeapon : public Model
-  {
-  public:
-    enum Action {
-      NOTHING  = 0,
-      RELOAD   = 1,
-      CHANGE_AMMO  = 2,
-      SPECIAL  = 3
-    };
-
-  protected:
-    enum State {
-      IDLE = 0,
-      PRIMARY_FIRE = 1,
-      SECONDARY_FIRE = 2,
-      RELOADING = 3,
-      CHANGING_AMMO = 4,
-    };
-
-  public:
-    BaseWeapon();
-          virtual ~BaseWeapon();
-
-    bool addAction(const Action);
-
-    void primaryFireRequest();
-
-    void secondaryFireRequest();
-
-    int getAmmoState();
-
-    void setAmmoDump(AmmunitionDump*);
-
-    inline virtual void loadParams(TiXmlElement* xmlElem) { Model::loadParams(xmlElem); };
-
-    virtual void tick(float dt);
-
-  protected:
-    virtual void primaryFire() = 0;
-
-    virtual void primaryFiring(float) = 0;
-
-    virtual void secondaryFire() = 0;
-
-    virtual void secondaryFiring(float) = 0;
-
-    virtual void registerAllVariables() { };
-
-  public:
-
-  protected:
-    Ogre::SceneManager *sceneMgr_;
-
-    int bulletCounter_;
-    BulletManager *bulletManager_;
-
-    AmmunitionDump *ammoDump_;
-
-    bool primaryFireRequest_;
-    bool secondaryFireRequest_;
-
-    float totalTime_;
-    float actionStartTime_;
-
-    State currentState_;
-    bool secondaryFired_;
-
-    Action nextAction_;
-    bool actionAdded_;
-    float timeSinceNextActionAdded_;
-    static float nextActionValidityPeriod_s;
-
-    // weapon properties
-    int leftAmmo_;
-    float primaryFirePower_;
-    float secondaryFirePower_;
-    float primaryFiringRate_;
-    float secondaryFiringRate_;
-    Real primaryBulletSpeed_;
-    Real secondaryBulletSpeed_;
-
-    int magazineSize_;
-
-  };
-}
-
-#endif /* _BaseWeapon_H__ */
+#ifndef _BaseWeapon_H__#define _BaseWeapon_H__#include "OrxonoxPrereqs.h"#include <OgrePrerequisites.h>#include "../Model.h"namespace orxonox {  class _OrxonoxExport BaseWeapon : public Model  {  public:    enum Action {      NOTHING  = 0,      RELOAD   = 1,      CHANGE_AMMO  = 2,      SPECIAL  = 3    };  protected:    enum State {      IDLE = 0,      PRIMARY_FIRE = 1,      SECONDARY_FIRE = 2,      RELOADING = 3,      CHANGING_AMMO = 4,    };  public:    BaseWeapon();          virtual ~BaseWeapon();    bool addAction(const Action);    void primaryFireRequest();    void secondaryFireRequest();    int getAmmoState();    void setAmmoDump(AmmunitionDump*);    inline virtual void loadParams(TiXmlElement* xmlElem) { Model::loadParams(xmlElem); };    virtual void tick(float dt);  protected:    virtual void primaryFire() = 0;    virtual void primaryFiring(float) = 0;    virtual void secondaryFire() = 0;    virtual void secondaryFiring(float) = 0;    virtual void registerAllVariables() { };  public:  protected:    Ogre::SceneManager *sceneMgr_;    int bulletCounter_;    BulletManager *bulletManager_;    AmmunitionDump *ammoDump_;    bool primaryFireRequest_;    bool secondaryFireRequest_;    float totalTime_;    float actionStartTime_;    State currentState_;    bool secondaryFired_;    Action nextAction_;    bool actionAdded_;    float timeSinceNextActionAdded_;    static float nextActionValidityPeriod_s;    // weapon properties    int leftAmmo_;    float primaryFirePower_;    float secondaryFirePower_;    float primaryFiringRate_;    float secondaryFiringRate_;    Real primaryBulletSpeed_;    Real secondaryBulletSpeed_;    int magazineSize_;  };}#endif /* _BaseWeapon_H__ */