Changeset 2820

Timestamp:

Mar 23, 2009, 12:44:10 AM (16 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).

Location:

code/branches/miniprojects/src/orxonox/objects/gametypes

Files:

• CMakeLists.txt (modified) (1 diff)
• Deathmatch.cc (added)
• Deathmatch.h (added)
• Gametype.cc (modified) (8 diffs)
• Gametype.h (modified) (1 diff)
• TeamGametype.cc (modified) (3 diffs)
• TeamGametype.h (modified) (2 diffs)

code/branches/miniprojects/src/orxonox/objects/gametypes/CMakeLists.txt

@@ -1 +1 @@
 ADD_SOURCE_FILES(ORXONOX_SRC_FILES
   Gametype.cc
+  Deathmatch.cc
   TeamGametype.cc
 )

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

@@ -44 +44 @@
 #include "objects/worldentities/Camera.h"
 
-#include "network/Host.h"
-
 namespace orxonox
 {
@@ -105 +103 @@
         this->addBots(this->numberOfBots_);
 
-        COUT(0) << "game started" << std::endl;
         this->gtinfo_.bStarted_ = true;
 
@@ -113 +110 @@
     void Gametype::end()
     {
-        COUT(0) << "game ended" << std::endl;
         this->gtinfo_.bEnded_ = true;
     }
@@ -120 +116 @@
     {
         this->players_[player].state_ = PlayerState::Joined;
-
-        std::string message = player->getName() + " entered the game";
-        COUT(0) << message << std::endl;
-        Host::Broadcast(message);
-    }
-
-    void Gametype::playerLeft(PlayerInfo* player)
+    }
+
+    bool Gametype::playerLeft(PlayerInfo* player)
     {
         std::map<PlayerInfo*, Player>::iterator it = this->players_.find(player);
@@ -132 +124 @@
         {
             this->players_.erase(it);
-
-            std::string message = player->getName() + " left the game";
-            COUT(0) << message << std::endl;
-            Host::Broadcast(message);
-        }
+            return true;
+        }
+        return false;
     }
 
@@ -147 +137 @@
     }
 
-    void Gametype::playerChangedName(PlayerInfo* player)
+    bool Gametype::playerChangedName(PlayerInfo* player)
     {
         if (this->players_.find(player) != this->players_.end())
@@ -153 +143 @@
             if (player->getName() != player->getOldName())
             {
-                std::string message = player->getOldName() + " changed name to " + player->getName();
-                COUT(0) << message << std::endl;
-                Host::Broadcast(message);
-            }
-        }
+                return true;
+            }
+        }
+        return false;
     }
 
@@ -201 +190 @@
     void Gametype::pawnKilled(Pawn* victim, Pawn* killer)
     {
-        if (victim && victim->getPlayer())
-        {
-            std::string message;
-            if (killer)
-            {
-                if (killer->getPlayer())
-                    message = victim->getPlayer()->getName() + " was killed by " + killer->getPlayer()->getName();
-                else
-                    message = victim->getPlayer()->getName() + " was killed";
-            }
-            else
-                message = victim->getPlayer()->getName() + " died";
-
-            COUT(0) << message << std::endl;
-            Host::Broadcast(message);
-        }
-
         if (victim && victim->getPlayer())
         {

code/branches/miniprojects/src/orxonox/objects/gametypes/Gametype.h

@@ -84 +84 @@
             virtual void end();
             virtual void playerEntered(PlayerInfo* player);
-            virtual void playerLeft(PlayerInfo* player);
+            virtual bool playerLeft(PlayerInfo* player);
             virtual void playerSwitched(PlayerInfo* player, Gametype* newgametype);
             virtual void playerSwitchedBack(PlayerInfo* player, Gametype* oldgametype);
-            virtual void playerChangedName(PlayerInfo* player);
+            virtual bool playerChangedName(PlayerInfo* player);
 
             virtual void playerScored(Player& player);

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;
     }
 

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

@@ -34 +34 @@
 #include <vector>
 
-#include "Gametype.h"
+#include "Deathmatch.h"
 
 namespace orxonox
 {
-    class _OrxonoxExport TeamGametype : public Gametype
+    class _OrxonoxExport TeamGametype : public Deathmatch
     {
         public:
@@ -47 +47 @@
 
             virtual void playerEntered(PlayerInfo* player);
-            virtual void playerLeft(PlayerInfo* player);
+            virtual bool playerLeft(PlayerInfo* player);
 
             virtual bool allowPawnHit(Pawn* victim, Pawn* originator = 0);