Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Sep 1, 2006, 8:06:39 PM (18 years ago)
Author:
bensch
Message:

renamed newclassid to classid and newobjectlist to objectlist

Location:
branches/new_class_id/src/world_entities/weapons
Files:
30 edited

Legend:

Unmodified
Added
Removed

  • branches/new_class_id/src/world_entities/weapons/aim.cc

    r9709 r9715  
    2929
    3030
    31 NewObjectListDefinition(Aim);
     31ObjectListDefinition(Aim);
    3232
    3333/**

  • branches/new_class_id/src/world_entities/weapons/aim.h

    r9709 r9715  
    2929class Aim : public PNode, public Element2D
    3030{
    31   NewObjectListDeclaration(Aim);
     31  ObjectListDeclaration(Aim);
    3232
    3333public:

  • branches/new_class_id/src/world_entities/weapons/aiming_system.cc

    r9709 r9715  
    3030
    3131
    32 NewObjectListDefinition(AimingSystem);
     32ObjectListDefinition(AimingSystem);
    3333
    3434/**

  • branches/new_class_id/src/world_entities/weapons/aiming_system.h

    r9709 r9715  
    2121class AimingSystem : public WorldEntity
    2222{
    23   NewObjectListDeclaration(AimingSystem);
     23  ObjectListDeclaration(AimingSystem);
    2424
    2525 public:

  • branches/new_class_id/src/world_entities/weapons/aiming_turret.cc

    r9709 r9715  
    2828
    2929#include "class_id.h"
    30 NewObjectListDefinitionID(AimingTurret, CL_AIMING_TURRET);
     30ObjectListDefinitionID(AimingTurret, CL_AIMING_TURRET);
    3131CREATE_FACTORY(AimingTurret);
    3232

  • branches/new_class_id/src/world_entities/weapons/aiming_turret.h

    r9709 r9715  
    1313class AimingTurret : public Weapon
    1414{
    15   NewObjectListDeclaration(AimingTurret);
     15  ObjectListDeclaration(AimingTurret);
    1616
    1717public:

  • branches/new_class_id/src/world_entities/weapons/ammo_container.cc

    r9705 r9715  
    2323
    2424
    25 NewObjectListDefinition(AmmoContainer);
     25ObjectListDefinition(AmmoContainer);
    2626/**
    2727 * standard constructor
    2828 * @todo this constructor is not jet implemented - do it
    2929*/
    30 AmmoContainer::AmmoContainer (const NewClassID& projectileType, float maxEnergy)
     30AmmoContainer::AmmoContainer (const ClassID& projectileType, float maxEnergy)
    3131{
    3232  this->registerObject(this, AmmoContainer::_objectList);

  • branches/new_class_id/src/world_entities/weapons/ammo_container.h

    r9705 r9715  
    1717//! A class for Storing energy of Projectiles.
    1818class AmmoContainer : public BaseObject {
    19   NewObjectListDeclaration(AmmoContainer);
     19  ObjectListDeclaration(AmmoContainer);
    2020
    2121 public:
    22   AmmoContainer(const NewClassID& id, float maxEnergy = DEFAULT_MAX_ENERGY);
     22  AmmoContainer(const ClassID& id, float maxEnergy = DEFAULT_MAX_ENERGY);
    2323  virtual ~AmmoContainer();
    2424
    2525  bool operator=(int projectileType) const { return (this->projectileType == projectileType); };
    26   NewClassID getProjectileType() const { return this->projectileType; };
     26  ClassID getProjectileType() const { return this->projectileType; };
    2727
    2828  float increaseEnergy(float energy);
    … …  
    4242   float  maxEnergy;
    4343
    44    NewClassID projectileType;
     44   ClassID projectileType;
    4545};
    4646

  • branches/new_class_id/src/world_entities/weapons/boomerang_gun.cc

    r9709 r9715  
    2828
    2929#include "class_id.h"
    30 NewObjectListDefinitionID(BoomerangGun, CL_BOOMERANG_GUN);
     30ObjectListDefinitionID(BoomerangGun, CL_BOOMERANG_GUN);
    3131CREATE_FACTORY(BoomerangGun);
    3232

  • branches/new_class_id/src/world_entities/weapons/boomerang_gun.h

    r9709 r9715  
    1111class BoomerangGun : public Weapon
    1212  {
    13     NewObjectListDeclaration(BoomerangGun);
     13    ObjectListDeclaration(BoomerangGun);
    1414  public:
    1515    BoomerangGun ();

  • branches/new_class_id/src/world_entities/weapons/cannon.cc

    r9709 r9715  
    3737
    3838#include "class_id.h"
    39 NewObjectListDefinitionID(Cannon, CL_CANNON);
     39ObjectListDefinitionID(Cannon, CL_CANNON);
    4040CREATE_FACTORY(Cannon);
    4141

  • branches/new_class_id/src/world_entities/weapons/cannon.h

    r9709 r9715  
    1212class Cannon : public Weapon
    1313  {
    14     NewObjectListDeclaration(Cannon);
     14    ObjectListDeclaration(Cannon);
    1515  public:
    1616    Cannon ();

  • branches/new_class_id/src/world_entities/weapons/crosshair.cc

    r9705 r9715  
    2626
    2727
    28 NewObjectListDefinition(Crosshair);
     28ObjectListDefinition(Crosshair);
    2929/**
    3030 * standart constructor

  • branches/new_class_id/src/world_entities/weapons/crosshair.h

    r9705 r9715  
    2222//! A class that enables the
    2323class Crosshair : public PNode, public Element2D, public EventListener {
    24   NewObjectListDeclaration(Crosshair);
     24  ObjectListDeclaration(Crosshair);
    2525 public:
    2626  Crosshair(const TiXmlElement* root = NULL);

  • branches/new_class_id/src/world_entities/weapons/fps_sniper_rifle.cc

    r9709 r9715  
    4040
    4141#include "class_id.h"
    42 NewObjectListDefinitionID(FPSSniperRifle, CL_FPS_SNIPER_RIFLE);
     42ObjectListDefinitionID(FPSSniperRifle, CL_FPS_SNIPER_RIFLE);
    4343CREATE_FACTORY(FPSSniperRifle);
    4444

  • branches/new_class_id/src/world_entities/weapons/fps_sniper_rifle.h

    r9709 r9715  
    3939class FPSSniperRifle : public Weapon
    4040  {
    41     NewObjectListDeclaration(FPSSniperRifle);
     41    ObjectListDeclaration(FPSSniperRifle);
    4242
    4343  public:

  • branches/new_class_id/src/world_entities/weapons/hyperblaster.cc

    r9709 r9715  
    3636
    3737#include "class_id.h"
    38 NewObjectListDefinitionID(Hyperblaster, CL_HYPERBLASTER);
     38ObjectListDefinitionID(Hyperblaster, CL_HYPERBLASTER);
    3939CREATE_FACTORY(Hyperblaster);
    4040

  • branches/new_class_id/src/world_entities/weapons/hyperblaster.h

    r9709 r9715  
    1212class Hyperblaster : public Weapon
    1313  {
    14     NewObjectListDeclaration(Hyperblaster);
     14    ObjectListDeclaration(Hyperblaster);
    1515    public:
    1616    Hyperblaster (const TiXmlElement* root = NULL);

  • branches/new_class_id/src/world_entities/weapons/laser_cannon.cc

    r9709 r9715  
    3232
    3333#include "class_id.h"
    34 NewObjectListDefinitionID(LaserCannon, CL_LASER_CANNON);
     34ObjectListDefinitionID(LaserCannon, CL_LASER_CANNON);
    3535CREATE_FACTORY(LaserCannon);
    3636

  • branches/new_class_id/src/world_entities/weapons/laser_cannon.h

    r9709 r9715  
    2929class LaserCannon : public Weapon
    3030  {
    31     NewObjectListDeclaration(LaserCannon);
     31    ObjectListDeclaration(LaserCannon);
    3232    public:
    3333    LaserCannon (const TiXmlElement* root = NULL);

  • branches/new_class_id/src/world_entities/weapons/targeting_turret.cc

    r9709 r9715  
    2727
    2828#include "class_id.h"
    29 NewObjectListDefinitionID(TargetingTurret, CL_TARGETING_TURRET);
     29ObjectListDefinitionID(TargetingTurret, CL_TARGETING_TURRET);
    3030CREATE_FACTORY(TargetingTurret);
    3131

  • branches/new_class_id/src/world_entities/weapons/targeting_turret.h

    r9709 r9715  
    1212class TargetingTurret : public Weapon
    1313{
    14   NewObjectListDeclaration(TargetingTurret);
     14  ObjectListDeclaration(TargetingTurret);
    1515public:
    1616  TargetingTurret(const TiXmlElement* root = NULL);

  • branches/new_class_id/src/world_entities/weapons/test_gun.cc

    r9709 r9715  
    3434
    3535#include "class_id.h"
    36 NewObjectListDefinitionID(TestGun, CL_TEST_GUN);
     36ObjectListDefinitionID(TestGun, CL_TEST_GUN);
    3737CREATE_FACTORY(TestGun);
    3838/**

  • branches/new_class_id/src/world_entities/weapons/test_gun.h

    r9709 r9715  
    3737class TestGun : public Weapon
    3838  {
    39     NewObjectListDeclaration(TestGun);
     39    ObjectListDeclaration(TestGun);
    4040  public:
    4141    TestGun (int leftRight);

  • branches/new_class_id/src/world_entities/weapons/turret.cc

    r9709 r9715  
    2828
    2929#include "class_id.h"
    30 NewObjectListDefinitionID(Turret, CL_TURRET);
     30ObjectListDefinitionID(Turret, CL_TURRET);
    3131CREATE_FACTORY(Turret);
    3232

  • branches/new_class_id/src/world_entities/weapons/turret.h

    r9709 r9715  
    1111class Turret : public Weapon
    1212  {
    13     NewObjectListDeclaration(Turret);
     13    ObjectListDeclaration(Turret);
    1414  public:
    1515    Turret ();

  • branches/new_class_id/src/world_entities/weapons/weapon.cc

    r9709 r9715  
    3535#include "elements/glgui_energywidget.h"
    3636
    37 NewObjectListDefinition(Weapon);
     37ObjectListDefinition(Weapon);
    3838
    3939////////////////////
    … …  
    7272 * @returns the newly created Weapon.
    7373 */
    74 Weapon* Weapon::createWeapon(const NewClassID& weaponID)
     74Weapon* Weapon::createWeapon(const ClassID& weaponID)
    7575{
    7676  BaseObject* createdObject = Factory::fabricate(weaponID);
    … …  
    179179 * What it does, is telling the Weapon what Projectiles it can Emit.
    180180 */
    181 void Weapon::setProjectileType(const NewClassID& projectile)
     181void Weapon::setProjectileType(const ClassID& projectile)
    182182{
    183183  this->projectile = projectile;

  • branches/new_class_id/src/world_entities/weapons/weapon.h

    r9705 r9715  
    8383class Weapon : public WorldEntity
    8484{
    85   NewObjectListDeclaration(Weapon);
     85  ObjectListDeclaration(Weapon);
    8686
    8787  public:
    … …  
    8989    Weapon ();
    9090    virtual ~Weapon ();
    91     static Weapon* createWeapon(const NewClassID& weaponID);
     91    static Weapon* createWeapon(const ClassID& weaponID);
    9292    static Weapon* createWeapon(const std::string& weaponName);
    9393
    … …  
    113113    /** @returns the Capabilities of this Weapon */
    114114    inline long getCapability() const { return this->capability; };
    115     void setProjectileType(const NewClassID& projectile);
     115    void setProjectileType(const ClassID& projectile);
    116116    void setProjectileTypeC(const std::string& projectile);
    117117    /** @returns The projectile's classID */
    118     inline NewClassID getProjectileType() { return this->projectile; };
     118    inline ClassID getProjectileType() { return this->projectile; };
    119119    /** @returns the FastFactory, that creates Projectiles of type getProjectile */
    120120    inline FastFactory* getProjectileFactory() { return this->projectileFactory; };
    … …  
    233233    bool                   chargeable;                      //!< if the Weapon is charcheable (if true, the weapon will charge before it fires.)
    234234
    235     NewClassID                projectile;                      //!< the projectile used for this weapon (since they should be generated via macro and the FastFactory, only the ClassID must be known.)
     235    ClassID                projectile;                      //!< the projectile used for this weapon (since they should be generated via macro and the FastFactory, only the ClassID must be known.)
    236236    FastFactory*           projectileFactory;               //!< A factory, that produces and handles the projectiles.
    237237  };

  • branches/new_class_id/src/world_entities/weapons/weapon_manager.cc

    r9705 r9715  
    3131
    3232
    33 NewObjectListDefinition(WeaponManager);
     33ObjectListDefinition(WeaponManager);
    3434/**
    3535 * @brief this initializes the weaponManager for a given nnumber of weapon slots
    … …  
    311311 * @param ammo the ammo to increase
    312312 */
    313 float WeaponManager::increaseAmmunition(const NewClassID& projectileType, float ammo)
     313float WeaponManager::increaseAmmunition(const ClassID& projectileType, float ammo)
    314314{
    315315  return this->getAmmoContainer(projectileType)->increaseEnergy(ammo);
    … …  
    523523}
    524524
    525 CountPointer<AmmoContainer>& WeaponManager::getAmmoContainer(const NewClassID& projectileType)
     525CountPointer<AmmoContainer>& WeaponManager::getAmmoContainer(const ClassID& projectileType)
    526526{
    527527  for (unsigned int i = 0; i < this->ammo.size(); i++)

  • branches/new_class_id/src/world_entities/weapons/weapon_manager.h

    r9705 r9715  
    3939 */
    4040class WeaponManager : public BaseObject {
    41   NewObjectListDeclaration(WeaponManager);
     41  ObjectListDeclaration(WeaponManager);
    4242
    4343  //! an enumerator defining a Slot, where a Weapon can be stored inside.
    … …  
    9090    void changeWeaponConfig(int weaponConfig);
    9191
    92     float increaseAmmunition(const NewClassID& projectileType, float ammo);
     92    float increaseAmmunition(const ClassID& projectileType, float ammo);
    9393    float inclreaseAmmunition(const Weapon* weapon, float ammo);
    9494
    … …  
    107107 // private:
    108108    int getNextFreeSlot(int configID, long capability = WTYPE_ALL);
    109     CountPointer<AmmoContainer>& getAmmoContainer(const NewClassID& projectileType);
     109    CountPointer<AmmoContainer>& getAmmoContainer(const ClassID& projectileType);
    110110    CountPointer<AmmoContainer>& getAmmoContainer(const Weapon* weapon);
    111111
Note: See TracChangeset for help on using the changeset viewer.