Changeset 9363 for code/branches/release2012/src/orxonox/gametypes/TeamDeathmatch.cc

Timestamp:

Sep 2, 2012, 6:45:40 PM (12 years ago)

Author:

jo

Message:

Teamdeathmatch ends if a certain number of opponents have been killed. (friendlyfire is not concerned)

File:

• code/branches/release2012/src/orxonox/gametypes/TeamDeathmatch.cc (modified) (6 diffs)

code/branches/release2012/src/orxonox/gametypes/TeamDeathmatch.cc

@@ -33 +33 @@
 #include "infos/PlayerInfo.h"
 #include "worldentities/pawns/Pawn.h"
+#include "core/ConfigValueIncludes.h"
 
 namespace orxonox
@@ -41 +42 @@
     {
         RegisterObject(TeamDeathmatch);
+
+        this->setConfigValues();
+    }
+
+    void TeamDeathmatch::setConfigValues()
+    {
+        SetConfigValue(maxScore_, 10);
     }
 
@@ -57 +65 @@
         std::string message("The match has ended.");
         ChatManager::message(message);
+        
+        //find team that won the match
+        int winnerTeam = 0;
+        int highestScore = 0;
+        for (std::map<PlayerInfo*, Player>::iterator it = this->players_.begin(); it != this->players_.end(); ++it)
+        {
+            if ( this->getTeamScore(it->first) > highestScore )
+            {
+                winnerTeam = this->getTeam(it->first);
+                highestScore = this->getTeamScore(it->first);
+            }
+        }
+
+        //announce win
+        this->announceTeamWin(winnerTeam);
     }
 
@@ -100 +123 @@
             {
                 if (killer->getPlayer())
+                {
                     message = victim->getPlayer()->getName() + " was killed by " + killer->getPlayer()->getName();
+                    if(this->isExactlyA(Class(TeamDeathmatch)) && (this->getTeamScore(killer->getPlayer()) >= (this->maxScore_ -1)) )
+                        this->end();
+                }
                 else
                     message = victim->getPlayer()->getName() + " was killed";
@@ -109 +136 @@
             ChatManager::message(message);
         }
-
         Gametype::pawnKilled(victim, killer);
     }
@@ -121 +147 @@
             const std::string& message = player->getName() + " scores!";
             ChatManager::message(message);
+
         }
     }