Changeset 2908 for code/branches/questsystem5/src/orxonox/objects/gametypes/Gametype.cc

Timestamp:

Apr 8, 2009, 12:58:47 AM (15 years ago)

Author:

dafrick

Message:

Reverted to revision 2906 (because I'm too stupid to merge correctly, 2nd try will follow shortly. )

Location:

code/branches/questsystem5

Files:

• . (modified) (1 prop)
• src/orxonox/objects/gametypes/Gametype.cc (modified) (14 diffs)

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

@@ -36 +36 @@
 #include "core/ConfigValueIncludes.h"
 #include "core/Template.h"
-#include "core/GameMode.h"
+#include "core/Core.h"
 #include "overlays/OverlayGroup.h"
 #include "objects/infos/PlayerInfo.h"
@@ -44 +44 @@
 #include "objects/worldentities/Camera.h"
 
+#include "network/Host.h"
+
 namespace orxonox
 {
@@ -64 +66 @@
         this->setConfigValues();
 
+        this->addBots(this->numberOfBots_);
+
         // load the corresponding score board
-        if (GameMode::showsGraphics() && this->scoreboardTemplate_ != "")
+        if (Core::showsGraphics() && this->scoreboardTemplate_ != "")
         {
             this->scoreboard_ = new OverlayGroup(this);
@@ -101 +105 @@
     void Gametype::start()
     {
-        this->addBots(this->numberOfBots_);
-
+        COUT(0) << "game started" << std::endl;
         this->gtinfo_.bStarted_ = true;
 
@@ -110 +113 @@
     void Gametype::end()
     {
+        COUT(0) << "game ended" << std::endl;
         this->gtinfo_.bEnded_ = true;
     }
@@ -116 +120 @@
     {
         this->players_[player].state_ = PlayerState::Joined;
-    }
-
-    bool Gametype::playerLeft(PlayerInfo* player)
+
+        std::string message = player->getName() + " entered the game";
+        COUT(0) << message << std::endl;
+        Host::Broadcast(message);
+    }
+
+    void Gametype::playerLeft(PlayerInfo* player)
     {
         std::map<PlayerInfo*, Player>::iterator it = this->players_.find(player);
@@ -124 +132 @@
         {
             this->players_.erase(it);
-            return true;
-        }
-        return false;
+
+            std::string message = player->getName() + " left the game";
+            COUT(0) << message << std::endl;
+            Host::Broadcast(message);
+        }
     }
 
@@ -137 +147 @@
     }
 
-    bool Gametype::playerChangedName(PlayerInfo* player)
+    void Gametype::playerChangedName(PlayerInfo* player)
     {
         if (this->players_.find(player) != this->players_.end())
@@ -143 +153 @@
             if (player->getName() != player->getOldName())
             {
-                return true;
-            }
-        }
-        return false;
+                std::string message = player->getOldName() + " changed name to " + player->getName();
+                COUT(0) << message << std::endl;
+                Host::Broadcast(message);
+            }
+        }
     }
 
@@ -157 +168 @@
     }
 
-    void Gametype::playerPreSpawn(PlayerInfo* player)
-    {
-    }
-
-    void Gametype::playerPostSpawn(PlayerInfo* player)
-    {
-    }
-
-    void Gametype::playerStartsControllingPawn(PlayerInfo* player, Pawn* pawn)
-    {
-    }
-
-    void Gametype::playerStopsControllingPawn(PlayerInfo* player, Pawn* pawn)
-    {
-    }
-
-    bool Gametype::allowPawnHit(Pawn* victim, Pawn* originator)
-    {
-        return true;
-    }
-
-    bool Gametype::allowPawnDamage(Pawn* victim, Pawn* originator)
-    {
-        return true;
-    }
-
-    bool Gametype::allowPawnDeath(Pawn* victim, Pawn* originator)
-    {
-        return true;
-    }
-
     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())
         {
@@ -201 +198 @@
                 if (killer)
                 {
-                    std::map<PlayerInfo*, Player>::iterator it = this->players_.find(killer->getPlayer());
-                    if (it != this->players_.end())
-                        it->second.frags_++;
+                    std::map<PlayerInfo*, Player>::iterator itKiller = this->players_.find(killer->getPlayer());
+                    if (itKiller != this->players_.end())
+                    {
+                        this->playerScored(itKiller->second);
+                    }
+                    else
+                        COUT(2) << "Warning: Killing Pawn was not in the playerlist" << std::endl;
                 }
 
@@ -224 +225 @@
     }
 
-    void Gametype::playerScored(PlayerInfo* player)
-    {
-        std::map<PlayerInfo*, Player>::iterator it = this->players_.find(player);
-        if (it != this->players_.end())
-            it->second.frags_++;
-    }
-
-    int Gametype::getScore(PlayerInfo* player) const
-    {
-        std::map<PlayerInfo*, Player>::const_iterator it = this->players_.find(player);
-        if (it != this->players_.end())
-            return it->second.frags_;
-        else
-            return 0;
+    void Gametype::playerScored(Player& player)
+    {
+        player.frags_++;
     }
 
@@ -346 +336 @@
         if (spawnpoint)
         {
-            this->playerPreSpawn(player);
             player->startControl(spawnpoint->spawn());
             this->players_[player].state_ = PlayerState::Alive;
-            this->playerPostSpawn(player);
         }
         else
@@ -361 +349 @@
     {
         for (unsigned int i = 0; i < amount; ++i)
-            this->botclass_.fabricate(this);
+            new Bot(this);
     }