Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Nov 26, 2008, 7:48:26 PM (16 years ago)
Author:
dsommer
Message:

Added ShipEquipment to Pawn and various funtions for it -not compiling, because private…

Location:
code/branches/pickups2/src/orxonox/objects/worldentities/pawns
Files:
2 edited

Legend:

Unmodified
Added
Removed

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

    r2098 r2289  
    3131
    3232#include "OrxonoxPrereqs.h"
    33 
     33#include "objects/pickup/ShipEquipment.h"
    3434#include "objects/worldentities/ControllableEntity.h"
    3535
    … …  
    7575
    7676            virtual void fire();
    77 
     77            ShipEquipment pickUp;
    7878            virtual void postSpawn();
    7979
    … …  
    8383
    8484            bool bAlive_;
     85           
    8586
    8687            float health_;

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

    r2087 r2289  
    7474            inline float getMaxSecondarySpeed() const
    7575                { return this->maxSecondarySpeed_; }
    76             inline float getMaxRotation() const
    77                 { return this->maxRotation_.valueDegrees(); }
     76            inline const Degree& getMaxRotation() const
     77                { return this->maxRotation_; }
    7878            inline float getTransAcc() const
    7979                { return this->translationAcceleration_; }
    80             inline float getRotAcc() const
    81                 { return this->rotationAcceleration_.valueDegrees(); }
     80            inline const Degree& getRotAcc() const
     81                { return this->rotationAcceleration_; }
    8282            inline float getTransDamp() const
    8383                { return this->translationDamping_; }
    … …  
    9090            float translationAcceleration_;
    9191            float translationDamping_;
    92 
    9392            Degree maxRotation_;
    9493            Degree rotationAcceleration_;
Note: See TracChangeset for help on using the changeset viewer.