Changeset 7954 in orxonox.OLD for trunk/src/world_entities/playable.cc

Timestamp:

May 29, 2006, 3:28:41 PM (19 years ago)

Author:

patrick

Message:

trunk: merged the network branche back to trunk.

File:

• trunk/src/world_entities/playable.cc (modified) (2 diffs)

trunk/src/world_entities/playable.cc

@@ -62 +62 @@
 
   this->score = 0;
-  this->oldScore = 0;
   this->collider = NULL;
 
   this->bDead = false;
+
+  registerVar( new SynchronizeableInt( &score, &score, "score" ) );
+  registerVar( new SynchronizeableBool( &bFire, &bFire, "bFire", PERMISSION_OWNER));
 }
 
@@ -484 +486 @@
 
 
-#define DATA_FLAGS    1
-#define DATA_SCORE    2
-
-#define FLAGS_bFire   1
-
-int Playable::writeSync( const byte * data, int length, int sender )
-{
-  SYNCHELP_READ_BEGIN();
-
-  byte b;
-  SYNCHELP_READ_BYTE( b, NWT_PL_B );
-
-  byte flags;
-
-  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;
-}
-
-int Playable::readSync( byte * data, int maxLength )
-{
-  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;
-
-  if ( bFire )
-    flags |= FLAGS_bFire;
-
-
-  SYNCHELP_WRITE_BYTE( DATA_FLAGS, NWT_PL_B);
-  SYNCHELP_WRITE_BYTE( flags, NWT_PL_FLAGS );
-  oldFlags = flags;
-
-
-  return SYNCHELP_WRITE_N;
-}
-
-bool Playable::needsReadSync( )
-{
-  if ( score != oldScore && isServer() )
-    return true;
-
-  byte flags = 0;
-
-  if ( bFire )
-    flags |= FLAGS_bFire;
-
-  return flags!=oldFlags;
-}
-
 
 /**