Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Feb 20, 2018, 12:09:09 AM (6 years ago)
Author:
landauf
Message:

tabs → spaces

File:
1 edited

Legend:

Unmodified
Added
Removed
  • code/branches/Presentation_HS17_merge/src/orxonox/worldentities/pawns/ShootableObstacle.h

    r11781 r11782  
    3838        : public Pawn
    3939    {
    40             public:
    41                 ShootableObstacle(Context* context);
    42                 virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
    43                 virtual bool collidesAgainst(WorldEntity* otherObject, const btCollisionShape* cs, btManifoldPoint& contactPoint) override;
     40        public:
     41            ShootableObstacle(Context* context);
     42            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
     43            virtual bool collidesAgainst(WorldEntity* otherObject, const btCollisionShape* cs, btManifoldPoint& contactPoint) override;
    4444
    45                 inline void setCollisionDamage(float c)
    46                         { this->collisionDamage_ = c; }
     45            inline void setCollisionDamage(float c)
     46                    { this->collisionDamage_ = c; }
    4747
    48                 inline float getCollisionDamage()
    49                     { return this->collisionDamage_; }
     48            inline float getCollisionDamage()
     49                { return this->collisionDamage_; }
    5050
    51                 inline void setEnableCollisionDamage(bool c)
    52                 {
    53                     this->enableCollisionDamage_ = c;
    54                     this->enableCollisionCallback();
    55                 }
     51            inline void setEnableCollisionDamage(bool c)
     52            {
     53                this->enableCollisionDamage_ = c;
     54                this->enableCollisionCallback();
     55            }
    5656
    57                 inline bool getEnableCollisionDamage()
    58                     { return this->enableCollisionDamage_; }
     57            inline bool getEnableCollisionDamage()
     58                { return this->enableCollisionDamage_; }
    5959
    60             private:
    61                 float collisionDamage_;
    62                 bool enableCollisionDamage_;
     60        private:
     61            float collisionDamage_;
     62            bool enableCollisionDamage_;
    6363    };
    6464}
Note: See TracChangeset for help on using the changeset viewer.