Changeset 8244 in orxonox.OLD

Timestamp:

Jun 8, 2006, 2:18:54 PM (18 years ago)

Author:

rennerc

Message:

fixed bug with synchronizeable vars after vars with non const length

Location:

branches/network/src/lib

Files:

• network/network_stream.cc (modified) (1 diff)
• network/player_stats.cc (modified) (2 diffs)
• network/synchronizeable.cc (modified) (2 diffs)
• shell/some_shell_commands.cc (modified) (1 diff)

branches/network/src/lib/network/network_stream.cc

@@ -538 +538 @@
       //PRINTF(0)("GGGGGOOOOOOOOOOTTTTTTTT: %d\n", compLength);
       packetLength = Zip::getInstance()->unZip( compBuf, compLength, buf, UDP_PACKET_SIZE );
-      
+
       if ( packetLength < 4*INTSIZE )
       {

branches/network/src/lib/network/player_stats.cc

@@ -27 +27 @@
 
 CREATE_FACTORY(PlayerStats, CL_PLAYER_STATS);
-SHELL_COMMAND(nick, PlayerStats, shellNick);
+
 
 /**
@@ -219 +219 @@
 void PlayerStats::shellNick( const std::string& newNick )
 {
-  //if ( getStats( SharedNetworkData::getInstance()->getHostID() ) )
-  //  getStats( SharedNetworkData::getInstance()->getHostID() )->setNickName( newNick );
-}
-
-
+  if ( getStats( SharedNetworkData::getInstance()->getHostID() ) )
+    getStats( SharedNetworkData::getInstance()->getHostID() )->setNickName( newNick );
+}
+
+

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

@@ -175 +175 @@
   
   bool hasPermission;
+  bool sizeChanged = false;
 
   // now do the actual synchronization: kick all variables to write into a common buffer
@@ -185 +186 @@
             (*it)->checkPermission( PERMISSION_ALL ) 
                     );
-    
-    if ( ( sizeIter != stateFrom->sizeList.end() && *sizeIter != (*it)->getSize() ) || ( hasPermission && (*it)->getPriority() >= priorityTH ) || sizeIter == stateFrom->sizeList.end() )
+    if ( sizeIter != stateFrom->sizeList.end() || *sizeIter != (*it)->getSize() ) 
+      sizeChanged = true;
+    
+    if ( ( hasPermission && (*it)->getPriority() >= priorityTH ) || sizeChanged )
     {
       n = (*it)->writeToBuf( stateTo->data+i, stateTo->dataLength - i );

branches/network/src/lib/shell/some_shell_commands.cc

@@ -28 +28 @@
 using namespace OrxShell;
 
-
+#include "player_stats.h"
+  SHELL_COMMAND(nick, PlayerStats, shellNick)->setAlias("nick");
 
 #include "class_list.h"