Changeset 2006 for code/branches/objecthierarchy/src/orxonox/objects/gametypes/Gametype.cc

Timestamp:

Oct 24, 2008, 2:48:43 AM (16 years ago)

Author:

landauf

Message:

many changes, can't remember everything, but these are the most important:

• attaching entities to other entities works
• displaying models, lights and shadows works
• controlling a spectator works
• removed an update hack in PositionableEntity because I've found a much better solution

and with "works" I mean: it works on client, server and standalone

File:

• code/branches/objecthierarchy/src/orxonox/objects/gametypes/Gametype.cc (modified) (4 diffs)

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

@@ -31 +31 @@
 
 #include "core/CoreIncludes.h"
-#include "core/ConsoleCommand.h"
 #include "objects/infos/PlayerInfo.h"
 #include "objects/worldentities/pawns/Spectator.h"
@@ -39 +38 @@
 namespace orxonox
 {
-    SetConsoleCommand(Gametype, listPlayers, true);
-
     CreateUnloadableFactory(Gametype);
 
@@ -48 +45 @@
 
         this->defaultPawn_ = Class(Spectator);
-        this->getConnectedClients();
 
         COUT(0) << "created Gametype" << std::endl;
-    }
-
-    Gametype* Gametype::getCurrentGametype()
-    {
-        for (ObjectList<Gametype>::iterator it = ObjectList<Gametype>::begin(); it != ObjectList<Gametype>::end(); ++it)
-            return (*it);
-
-        return 0;
-    }
-
-    PlayerInfo* Gametype::getClient(unsigned int clientID)
-    {
-        Gametype* gametype = Gametype::getCurrentGametype();
-        if (gametype)
-        {
-            std::map<unsigned int, PlayerInfo*>::const_iterator it = gametype->clients_.find(clientID);
-            if (it != gametype->clients_.end())
-                return it->second;
-        }
-        else
-        {
-            for (ObjectList<PlayerInfo>::iterator it = ObjectList<PlayerInfo>::begin(); it != ObjectList<PlayerInfo>::end(); ++it)
-                if (it->getClientID() == clientID)
-                    return (*it);
-        }
-        return 0;
-    }
-
-    void Gametype::listPlayers()
-    {
-        Gametype* gametype = Gametype::getCurrentGametype();
-
-        if (gametype)
-        {
-            for (std::set<PlayerInfo*>::const_iterator it = gametype->players_.begin(); it != gametype->players_.end(); ++it)
-                COUT(0) << "ID: " << (*it)->getClientID() << ", Name: " << (*it)->getName() << std::endl;
-        }
-        else
-        {
-            for (ObjectList<PlayerInfo>::iterator it = ObjectList<PlayerInfo>::begin(); it != ObjectList<PlayerInfo>::end(); ++it)
-                COUT(0) << "ID: " << (*it)->getClientID() << ", Name: " << (*it)->getName() << std::endl;
-        }
-    }
-
-    void Gametype::clientConnected(unsigned int clientID)
-    {
-        COUT(0) << "client connected" << std::endl;
-
-        // create new PlayerInfo instance
-        PlayerInfo* player = new PlayerInfo();
-        player->setClientID(clientID);
-
-        // add to clients-map
-        assert(!this->clients_[clientID]);
-        this->clients_[clientID] = player;
-    }
-
-    void Gametype::clientDisconnected(unsigned int clientID)
-    {
-        COUT(0) << "client disconnected" << std::endl;
-
-        // remove from clients-map
-        PlayerInfo* player = this->clients_[clientID];
-        this->clients_.erase(clientID);
-
-        // delete PlayerInfo instance
-        delete player;
     }
 
@@ -131 +60 @@
     void Gametype::removePlayer(PlayerInfo* player)
     {
-        player->stopControl();
-        this->players_.erase(player);
-        this->playerLeft(player);
+        if (this->players_.find(player) != this->players_.end())
+        {
+            player->stopControl();
+            this->players_.erase(player);
+            this->playerLeft(player);
+        }
     }