Changeset 9581 in orxonox.OLD for branches/proxy/src

Timestamp:

Jul 28, 2006, 8:51:34 PM (18 years ago)

Author:

patrick

Message:

traced bug to the permissions system of the MASTER_SERVER permission level. try this

Location:

branches/proxy/src/lib/network

Files:

• player_stats.h (modified) (2 diffs)
• synchronizeable.cc (modified) (1 diff)

branches/proxy/src/lib/network/player_stats.h

@@ -16 +16 @@
 enum
 {
-  TEAM_NOTEAM = -3,
-  TEAM_RANDOM = -2,
-  TEAM_SPECTATOR = -1
+  TEAM_NOTEAM       = -3,
+  TEAM_RANDOM       = -2,
+  TEAM_SPECTATOR    = -1
 };
+
 
 struct PlayerScore
@@ -26 +27 @@
   int score;
 };
+
+
 typedef std::list<PlayerScore> TeamScoreList;
 typedef std::map<int,TeamScoreList> ScoreList;
+
 
 //! A class for storing player information

branches/proxy/src/lib/network/synchronizeable.cc

@@ -227 +227 @@
       hasPermission = true;
     // SPECIAL: get write permissions if i am proxy server and i am able to overwrite the client stuff
+    else if( SharedNetworkData::getInstance()->isProxyServerActive() && this->networkStream->isUserClient(userId)
+             && (*it)->checkPermission( PERMISSION_MASTER_SERVER) )
+      hasPermission = true;
     else if( SharedNetworkData::getInstance()->isProxyServerActive() && this->networkStream->isUserClient(userId)
              && this->owner != userId && (*it)->checkPermission( PERMISSION_OWNER ) )