Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Dec 17, 2008, 8:00:43 AM (16 years ago)
Author:
landauf
Message:

merged pickups2 to presentation

Location:
code/branches/presentation
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • code/branches/presentation

  • code/branches/presentation/src/orxonox/objects/worldentities/pawns/Pawn.cc

    r2493 r2500  
    4949
    5050        PawnManager::touch();
    51 
     51        this->getPickUp().setPlayer(this);
    5252        this->bAlive_ = true;
    5353        this->fire_ = 0x0;
    … …  
    235235    }
    236236
     237    void Pawn::dropItems()
     238    {
     239        pickUp.eraseAll();
     240    }
     241
    237242    void Pawn::setWeaponSlot(WeaponSlot * wSlot)
    238243    {

  • code/branches/presentation/src/orxonox/objects/worldentities/pawns/Pawn.h

    r2493 r2500  
    3131
    3232#include "OrxonoxPrereqs.h"
    33 
     33#include "objects/pickup/ShipEquipment.h"
    3434#include "objects/worldentities/ControllableEntity.h"
    3535#include "objects/RadarViewable.h"
    … …  
    7777
    7878            virtual void fire(WeaponMode::Enum fireMode);
    79 
    8079            virtual void postSpawn();
    8180
    … …  
    105104                { return this->numexplosionchunks_; }
    106105
     106            inline ShipEquipment& getPickUp()
     107                {return this->pickUp;}
     108
     109            virtual void dropItems();
     110
    107111        protected:
    108112            virtual void death();
    … …  
    110114            virtual void spawneffect();
    111115
     116            ShipEquipment pickUp;
    112117            bool bAlive_;
     118           
    113119
    114120            float health_;

  • code/branches/presentation/src/orxonox/objects/worldentities/pawns/SpaceShip.cc

    r2489 r2500  
    5656        this->localAngularAcceleration_.setValue(0, 0, 0);
    5757        this->bBoost_ = false;
     58        this->bPermanentBoost_ = false;
    5859        this->steering_ = Vector3::ZERO;
    5960        this->engine_ = 0;

  • code/branches/presentation/src/orxonox/objects/worldentities/pawns/SpaceShip.h

    r2485 r2500  
    7979                { return this->enginetemplate_; }
    8080
     81            inline void setPermanentBoost(bool bPermanent)
     82                { this->bPermanentBoost_ = bPermanent; }
     83            inline bool getPermanentBoost() const
     84                { return this->bPermanentBoost_; }
     85
    8186        protected:
    8287            bool bInvertYAxis_;
    8388
    8489            bool bBoost_;
     90            bool bPermanentBoost_;
    8591            Vector3 steering_;
    8692            float primaryThrust_;
    8793            float auxilaryThrust_;
    8894            float rotationThrust_;
    89 
    9095            btVector3 localLinearAcceleration_;
    9196            btVector3 localAngularAcceleration_;
Note: See TracChangeset for help on using the changeset viewer.