Changeset 2820 for code/branches/miniprojects/src/orxonox/objects/gametypes/TeamGametype.cc

Timestamp:

Mar 23, 2009, 12:44:10 AM (15 years ago)

Author:

landauf

Message:

Split Gametype into Gametype+Deathmatch. The only difference is output like "player x killed player y" which only appears in Deathmatch now. TeamGametype inherits from Deathmatch (and will shortly be renamed into TeamDeathmatch).

File:

• code/branches/miniprojects/src/orxonox/objects/gametypes/TeamGametype.cc (modified) (3 diffs)

code/branches/miniprojects/src/orxonox/objects/gametypes/TeamGametype.cc

@@ -39 +39 @@
     CreateUnloadableFactory(TeamGametype);
 
-    TeamGametype::TeamGametype(BaseObject* creator) : Gametype(creator)
+    TeamGametype::TeamGametype(BaseObject* creator) : Deathmatch(creator)
     {
         RegisterObject(TeamGametype);
@@ -66 +66 @@
     void TeamGametype::playerEntered(PlayerInfo* player)
     {
-        Gametype::playerEntered(player);
+        Deathmatch::playerEntered(player);
 
         std::vector<unsigned int> playersperteam(this->teams_, 0);
@@ -88 +88 @@
     }
 
-    void TeamGametype::playerLeft(PlayerInfo* player)
+    bool TeamGametype::playerLeft(PlayerInfo* player)
     {
-        Gametype::playerLeft(player);
+        bool valid_player = Deathmatch::playerLeft(player);
 
-        this->players_.erase(player);
+        if (valid_player)
+            this->players_.erase(player);
+
+        return valid_player;
     }