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

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.h (modified) (3 diffs)

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

@@ -36 +36 @@
 #include "core/BaseObject.h"
 #include "core/Identifier.h"
-#include "network/ClientConnectionListener.h"
 #include "objects/worldentities/ControllableEntity.h"
 
 namespace orxonox
 {
-    class _OrxonoxExport Gametype : public BaseObject, public network::ClientConnectionListener
+    class _OrxonoxExport Gametype : public BaseObject
     {
         friend class PlayerInfo;
@@ -49 +48 @@
             virtual ~Gametype() {}
 
-            static Gametype* getCurrentGametype();
-            static void listPlayers();
-
-            inline const std::map<unsigned int, PlayerInfo*>& getClients() const
-                { return this->clients_; }
             inline const std::set<PlayerInfo*>& getPlayers() const
                 { return this->players_; }
-            static PlayerInfo* getClient(unsigned int clientID);
 
         protected:
-            virtual void clientConnected(unsigned int clientID);
-            virtual void clientDisconnected(unsigned int clientID);
-
             virtual void playerJoined(PlayerInfo* player);
             virtual void playerLeft(PlayerInfo* player);
@@ -72 +62 @@
 
             std::set<PlayerInfo*> players_;
-            std::map<unsigned int, PlayerInfo*> clients_;
             SubclassIdentifier<ControllableEntity> defaultPawn_;
     };