Changeset 2896 for code/trunk/src/orxonox/PlayerManager.cc

Timestamp:

Apr 6, 2009, 1:59:00 AM (15 years ago)

Author:

landauf

Message:

Merged gui branch back to trunk.

I did 2 small changes in IngameManager.cc on line 777 and 888 (yes, really), because const_reverse_iterator strangely doesn't work on MinGW.

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/orxonox/PlayerManager.cc (modified) (4 diffs)

code/trunk/src/orxonox/PlayerManager.cc

@@ -31 +31 @@
 
 #include "LevelManager.h"
-#include "core/Core.h"
+#include "core/GameMode.h"
 #include "core/CoreIncludes.h"
 #include "objects/Level.h"
@@ -58 +58 @@
     void PlayerManager::clientConnected(unsigned int clientID)
     {
-        if (Core::isMaster())
+        if (GameMode::isMaster())
         {
             COUT(3) << "client connected" << std::endl;
@@ -77 +77 @@
     void PlayerManager::clientDisconnected(unsigned int clientID)
     {
-        if (Core::isMaster())
+        if (GameMode::isMaster())
         {
             COUT(3) << "client disconnected" << std::endl;
@@ -97 +97 @@
     PlayerInfo* PlayerManager::getClient(unsigned int clientID) const
     {
-        if (Core::isMaster())
+        if (GameMode::isMaster())
         {
             std::map<unsigned int, PlayerInfo*>::const_iterator it = this->clients_.find(clientID);