Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Nov 12, 2008, 4:45:50 PM (17 years ago)
Author:
polakma
Message:

added munition, fixed reloadTimer_

File:
1 edited

Legend:

Unmodified
Added
Removed
  • code/branches/weapon2/src/orxonox/objects/weaponSystem/Weapon.h

    r2186 r2203  
    3535#include "tools/BillboardSet.h"
    3636#include "tools/Timer.h"
     37#include "core/Identifier.h"
     38
     39#include "WeaponSystem.h"
     40#include "Munition.h"
    3741
    3842namespace orxonox
     
    4751
    4852            virtual void fire();
     53            void timer();
    4954            void reloaded();
     55            void attachNeededMunition(std::string munitionType);
     56
     57            //get and set functions
    5058            virtual void setParentWeaponSystem();
    51             void attachNeededMunition(Munition *munitionPointer);
     59            Munition * getAttachedMunition();
     60            void setLoadingTime(float loadingTime);
     61            float getLoadingTime();
     62            void setWeaponReadyToShoot(bool b);
     63            bool getWeaponReadyToShoot();
     64            Timer<Weapon> *getTimer();
    5265
    5366            inline void setParentWeaponSlot(WeaponSlot *parentWeaponSlot)
     
    5669                { return parentWeaponSlot_; };
    5770
    58 
    59 
    60 
    6171        private:
    6272            bool weaponReadyToShoot_;
    6373            float loadingTime_;
    64             Munition *pointerToMunition_;
     74            Munition *munition_;
     75
    6576            WeaponSlot *parentWeaponSlot_;
    6677            WeaponSystem *parentWeaponSystem_;
     78            SubclassIdentifier<Munition> munitionIdentifier_;
    6779            Timer<Weapon> reloadTimer_;
    68 
    69 
    7080    };
    7181}
Note: See TracChangeset for help on using the changeset viewer.