Changeset 7979 in orxonox.OLD for branches

Timestamp:

May 30, 2006, 1:47:41 PM (19 years ago)

Author:

rennerc

Message:

fixed bug in client-client synchronisation

Location:

branches/network/src/lib/network

Files:

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

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

@@ -40 +40 @@
     void setPlayableUniqueId( int uniqueId );
     
+    inline std::string getModelFileName(){ return modelFileName; }
+    inline void setModelFileName( std::string filename ){ modelFileName = filename; }
+    
     Playable * getPlayable();
 

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

@@ -175 +175 @@
             this->isServer() && (*it)->checkPermission( PERMISSION_SERVER ) ||
             this->owner == this->hostID && (*it)->checkPermission( PERMISSION_OWNER ) ||
+            this->isServer() && this->owner != userId && (*it)->checkPermission( PERMISSION_OWNER ) ||
             (*it)->checkPermission( PERMISSION_ALL ) 
                     );
@@ -289 +290 @@
         (*it)->checkPermission( PERMISSION_SERVER ) && networkStream->isUserServer( userId ) ||
         (*it)->checkPermission( PERMISSION_OWNER ) && this->owner == userId ||
+        networkStream->isUserServer( userId ) && this->owner != getHostID() && (*it)->checkPermission( PERMISSION_OWNER ) ||
         (*it)->checkPermission( PERMISSION_ALL ) 
        )