Changeset 10970 for code/branches/presentationHS15/src/orxonox/worldentities

Timestamp:

Dec 11, 2015, 3:26:20 PM (9 years ago)

Author:

maxima

Message:

Merged campaign and presentation. Everything seems to work fine.

Location:

code/branches/presentationHS15

Files:

• . (modified) (1 prop)
• src/orxonox/worldentities/Actionpoint.cc (copied) (copied from code/branches/campaignHS15/src/orxonox/worldentities/Actionpoint.cc)
• src/orxonox/worldentities/Actionpoint.h (copied) (copied from code/branches/campaignHS15/src/orxonox/worldentities/Actionpoint.h)
• src/orxonox/worldentities/CMakeLists.txt (modified) (1 diff)
• src/orxonox/worldentities/SpawnPoint.h (modified) (1 diff)
• src/orxonox/worldentities/TeamSpawnPoint.cc (modified) (1 diff)
• src/orxonox/worldentities/TeamSpawnPoint.h (modified) (1 diff)
• src/orxonox/worldentities/pawns/Pawn.h (modified) (1 diff)

code/branches/presentationHS15/src/orxonox/worldentities/CMakeLists.txt

@@ -12 +12 @@
   TeamSpawnPoint.cc
   ExplosionPart.cc
+  Actionpoint.cc
 )
 

code/branches/presentationHS15/src/orxonox/worldentities/SpawnPoint.h

@@ -55 +55 @@
                 { return this->template_; }
 
-            Pawn* spawn();
+            virtual Pawn* spawn();
             void spawn(ControllableEntity* entity);
 

code/branches/presentationHS15/src/orxonox/worldentities/TeamSpawnPoint.cc

@@ -49 +49 @@
         XMLPortParam(TeamSpawnPoint, "team", setTeamNumber, getTeamNumber, xmlelement, mode).defaultValues(0);
     }
+    Pawn* TeamSpawnPoint::spawn()
+    {
+        Pawn* entity = SpawnPoint::spawn();
+        static_cast<ControllableEntity*>(entity)->setTeam (this->teamNumber_);
+        return entity;
+    }
 }

code/branches/presentationHS15/src/orxonox/worldentities/TeamSpawnPoint.h

@@ -49 +49 @@
             unsigned int getTeamNumber() const
                 { return this->teamNumber_; }
+            virtual Pawn* spawn();
 
         private:
-            unsigned int teamNumber_;
+            int teamNumber_;
     };
 }

code/branches/presentationHS15/src/orxonox/worldentities/pawns/Pawn.h

@@ -201 +201 @@
             const std::string& getExplosionSound();
 
+            virtual const WeaponSystem* getWeaponSystem() const
+                { return this->weaponSystem_; }
+
         protected:
             virtual void preDestroy();