Changeset 6963 in orxonox.OLD

Timestamp:

Feb 1, 2006, 5:07:36 PM (18 years ago)

Author:

rennerc

Message:

playable: sync score

Location:

branches/network/src/world_entities

Files:

• playable.cc (modified) (3 diffs)
• space_ships/space_ship.cc (modified) (1 diff)

branches/network/src/world_entities/playable.cc

@@ -286 +286 @@
 {
   SYNCHELP_READ_BEGIN();
-
+  
+  byte b;
+  SYNCHELP_READ_BYTE( b, NWT_PL_B );
+  
   byte flags;
-
-  SYNCHELP_READ_BYTE( flags, NWT_PL_FLAGS );
-
-  bFire = (flags & FLAGS_bFire) != 0;
+  
+  if ( b == DATA_FLAGS )
+  {
+    SYNCHELP_READ_BYTE( flags, NWT_PL_FLAGS );
+
+    bFire = (flags & FLAGS_bFire) != 0;
+    
+    return SYNCHELP_READ_N;
+  }
+  
+  if ( b == DATA_SCORE )
+  {
+    int newScore;
+    SYNCHELP_READ_BYTE( newScore, NWT_PL_SCORE );
+    setScore( newScore );
+    
+    return SYNCHELP_READ_N;
+  }
 
   return SYNCHELP_READ_N;
@@ -299 +316 @@
 {
   SYNCHELP_WRITE_BEGIN();
+  
+  if ( score != oldScore && isServer() )
+  {
+    SYNCHELP_WRITE_BYTE( DATA_SCORE, NWT_PL_B);
+    SYNCHELP_WRITE_INT( score, NWT_PL_SCORE );
+    oldScore = score;
+    
+    return SYNCHELP_WRITE_N;
+  }
+  
   byte flags = 0;
 
@@ -314 +341 @@
 bool Playable::needsReadSync( )
 {
-  //if ( score != oldScore )
-  //  return true;
+  if ( score != oldScore && isServer() )
+    return true;
 
   byte flags = 0;

branches/network/src/world_entities/space_ships/space_ship.cc

@@ -761 +761 @@
     }
 
-    if ( Playable::needsReadSync() )
+    while ( Playable::needsReadSync() )
     {
       sentSomething = true;