Changeset 10838 for code/branches/campaignHS15/src/orxonox/worldentities

Timestamp:

Nov 23, 2015, 3:50:59 PM (9 years ago)

Author:

gania

Message:

Gani changed something

Location:

code/branches/campaignHS15/src/orxonox/worldentities

Files:

• SpawnPoint.h (modified) (1 diff)
• TeamSpawnPoint.cc (modified) (1 diff)
• TeamSpawnPoint.h (modified) (1 diff)

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

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

code/branches/campaignHS15/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/campaignHS15/src/orxonox/worldentities/TeamSpawnPoint.h

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