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

Timestamp:

Feb 15, 2018, 12:11:04 AM (7 years ago)

Author:

landauf

Message:

[CampaignMap_HS17] some cleanup

Location:

code/branches/Presentation_HS17_merge/src/orxonox/worldentities

Files:

• NameableStaticEntity.h (modified) (1 diff)
• pawns/StoryModePawn.cc (modified) (2 diffs)
• pawns/StoryModePawn.h (modified) (1 diff)

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

@@ -1 +1 @@
 /*
-*This is the header of the NameableStaticEntity.cc file
-*In this file we define a constructor, destructor and additional function (which is important to name a planet)
-*
-*Author: Bolt Nikole
-*Co-Author: Fanconi Claudio
-*
-*/
+ *   ORXONOX - the hottest 3D action shooter ever to exist
+ *                    > www.orxonox.net <
+ *
+ *
+ *   License notice:
+ *
+ *   This program is free software; you can redistribute it and/or
+ *   modify it under the terms of the GNU General Public License
+ *   as published by the Free Software Foundation; either version 2
+ *   of the License, or (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ *   Author:
+ *      Bolt Nikola
+ *   Co-authors:
+ *      Claudio Fanconi
+ *
+ *   This is the header of the NameableStaticEntity.cc file
+ *   In this file we define a constructor, destructor and additional function (which is important to name a planet)
+ *
+ */
 
 #ifndef _NameableStaticEntity_H__

code/branches/Presentation_HS17_merge/src/orxonox/worldentities/pawns/StoryModePawn.cc

@@ -48 +48 @@
     {
         RegisterObject(StoryModePawn);
-        enableCollisionCallback();
     }
 
@@ -73 +72 @@
     }
 
-    void StoryModePawn::XMLPort(Element& xmlelement, XMLPort::Mode mode)
-    {
-        SUPER(StoryModePawn, XMLPort, xmlelement, mode);
-    }
-
     /**
     @brief

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

@@ -42 +42 @@
             StoryModePawn(Context* context);
 
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
-
             virtual void moveFrontBack(const Vector2& value) override;