Changeset 11782 for code/branches/Presentation_HS17_merge/src/orxonox

Timestamp:

Feb 20, 2018, 12:09:09 AM (7 years ago)

Author:

landauf

Message:

tabs → spaces

Location:

code/branches/Presentation_HS17_merge/src/orxonox/worldentities

Files:

• NameableStaticEntity.cc (modified) (1 diff)
• NameableStaticEntity.h (modified) (1 diff)
• pawns/ShootableObstacle.h (modified) (1 diff)

code/branches/Presentation_HS17_merge/src/orxonox/worldentities/NameableStaticEntity.cc

@@ -26 +26 @@
  *
  *
- *       Authors' Note:
- *       The following class inherits of its superclass planet
- *       It is meant only for the Campaign Map
- *       This subclass of planet has the addition, that they can be labeled ingame, just like bots are in a level gameplay (As it would be nice to see which level you can play) 
- *       
+ *   Authors' Note:
+ *   The following class inherits of its superclass planet
+ *   It is meant only for the Campaign Map
+ *   This subclass of planet has the addition, that they can be labeled ingame, just like bots are in a level gameplay (As it would be nice to see which level you can play)
+ *
  */
 

code/branches/Presentation_HS17_merge/src/orxonox/worldentities/NameableStaticEntity.h

@@ -41 +41 @@
     class _OrxonoxExport NameableStaticEntity : public StaticEntity
     {
-        public:
-                NameableStaticEntity(Context* context);
-                virtual ~NameableStaticEntity();
+        public:
+            NameableStaticEntity(Context* context);
+            virtual ~NameableStaticEntity();
             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
 

code/branches/Presentation_HS17_merge/src/orxonox/worldentities/pawns/ShootableObstacle.h

@@ -38 +38 @@
         : public Pawn
     {
-            public:
-                ShootableObstacle(Context* context);
-                virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
-                virtual bool collidesAgainst(WorldEntity* otherObject, const btCollisionShape* cs, btManifoldPoint& contactPoint) override;
+        public:
+            ShootableObstacle(Context* context);
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
+            virtual bool collidesAgainst(WorldEntity* otherObject, const btCollisionShape* cs, btManifoldPoint& contactPoint) override;
 
-                inline void setCollisionDamage(float c)
-                        { this->collisionDamage_ = c; }
+            inline void setCollisionDamage(float c)
+                    { this->collisionDamage_ = c; }
 
-                inline float getCollisionDamage()
-                    { return this->collisionDamage_; }
+            inline float getCollisionDamage()
+                { return this->collisionDamage_; }
 
-                inline void setEnableCollisionDamage(bool c)
-                {
-                    this->enableCollisionDamage_ = c;
-                    this->enableCollisionCallback();
-                }
+            inline void setEnableCollisionDamage(bool c)
+            {
+                this->enableCollisionDamage_ = c;
+                this->enableCollisionCallback();
+            }
 
-                inline bool getEnableCollisionDamage()
-                    { return this->enableCollisionDamage_; }
+            inline bool getEnableCollisionDamage()
+                { return this->enableCollisionDamage_; }
 
-            private:
-                float collisionDamage_;
-                bool enableCollisionDamage_;
+        private:
+            float collisionDamage_;
+            bool enableCollisionDamage_;
     };
 }