Changeset 6994 in orxonox.OLD

Timestamp:

Feb 2, 2006, 11:57:54 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the Network branche back here

Location:

trunk/src

Files:

• lib/network/network_game_manager.cc (modified) (2 diffs)
• lib/network/network_socket.cc (modified) (1 diff)
• lib/network/network_socket.h (modified) (1 diff)
• world_entities/playable.cc (modified) (4 diffs)
• world_entities/playable.h (modified) (1 diff)
• world_entities/space_ships/space_ship.cc (modified) (2 diffs)

trunk/src/lib/network/network_game_manager.cc

@@ -539 +539 @@
     PRINTF(0)("Fabricated %s with id %d\n", s->getClassName(), s->getUniqueID());
 
-    //HACK: hack to prevent collision
+    //TODO HACK: hack to prevent collision
     if ( b->isA(CL_WORLD_ENTITY) && !b->isA(CL_PLAYABLE) )
     {
@@ -551 +551 @@
       }
     }
-    ///HACK this is only for network multiplayer games.
+    ///TODO HACK this is only for network multiplayer games.
     if( b->isA(CL_SPACE_SHIP))
     {

trunk/src/lib/network/network_socket.cc

@@ -444 +444 @@
   if (blen>maxLength)
   {
-    PRINTF(1)("Buffersize is too small (%d) for packet (%d)\n", maxLength, blen);
+    PRINTF(1)("Buffersize is too small (%d) for packet (%d).\n", maxLength, blen);
     assert(false);
     return 0;

trunk/src/lib/network/network_socket.h

@@ -8 +8 @@
 #define _NETWORK_SOCKET
 
-//HACK else gdb will not work on server
+//TODO HACK else gdb will not work on server
 #define DONTEXITTHREADS
 

trunk/src/world_entities/playable.cc

@@ -305 +305 @@
 {
   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;
@@ -318 +335 @@
 {
   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;
 
@@ -324 +351 @@
 
 
+  SYNCHELP_WRITE_BYTE( DATA_FLAGS, NWT_PL_B);
   SYNCHELP_WRITE_BYTE( flags, NWT_PL_FLAGS );
   oldFlags = flags;
@@ -333 +361 @@
 bool Playable::needsReadSync( )
 {
-  //if ( score != oldScore )
-  //  return true;
+  if ( score != oldScore && isServer() )
+    return true;
 
   byte flags = 0;

trunk/src/world_entities/playable.h

@@ -84 +84 @@
     int                   oldScore;
 
-    //HACK: explosion emitter
+    //TODO HACK: explosion emitter
     DotEmitter*           emitter;
     SpriteParticles*      explosionParticles;

trunk/src/world_entities/space_ships/space_ship.cc

@@ -97 +97 @@
   {
     //this->loadModel("models/ships/reap_#.obj");
-    ///HACK this is only for network multiplayer games.
+    //TODO HACK this is only for network multiplayer games.
     if( this->getOwner()%2 == 0)
     {
@@ -762 +762 @@
     }
 
-    if ( Playable::needsReadSync() )
+    while ( Playable::needsReadSync() )
     {
       sentSomething = true;