Changeset 6861 in orxonox.OLD for branches/network/src/world_entities/space_ships/space_ship.cc

Timestamp:

Jan 30, 2006, 10:24:20 AM (18 years ago)

Author:

rennerc

Message:

fire over network works again

File:

• branches/network/src/world_entities/space_ships/space_ship.cc (modified) (11 diffs)

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

@@ -128 +128 @@
 
   bUp = bDown = bLeft = bRight = bAscend = bDescend = bRollL = bRollR = false;
-  bFire = false;
+
   xMouse = yMouse = 0;
   yInvert = 1;
@@ -517 +517 @@
 #define MASK_bAscend    16
 #define MASK_bDescend   32
-#define MASK_bFire      64
-#define MASK_bRollL    128
-#define MASK_bRollR    256
+#define MASK_bRollL     64
+#define MASK_bRollR    128
 
 #define DATA_state       1
@@ -526 +525 @@
 #define DATA_sync        4
 #define DATA_velocity    5
+#define DATA_playables   6
 
 int SpaceShip::writeBytes( const byte * data, int length, int sender )
@@ -548 +548 @@
     if ( b == DATA_flags )
     {
-      int flags = 0;
-      SYNCHELP_READ_INT( flags, NWT_SS_FLAGS );
-
-      bUp = (flags & MASK_bUp) != 0;
-      bDown = (flags & MASK_bDown) != 0;
-      bLeft = (flags & MASK_bLeft) != 0;
-      bRight = (flags & MASK_bRight) != 0;
-      bAscend = (flags & MASK_bAscend) != 0;
-      bDescend = (flags & MASK_bDescend) != 0;
-      bFire = (flags & MASK_bFire) != 0;
-      bRollL = (flags & MASK_bRollL) != 0;
-      bRollR = (flags & MASK_bRollR) != 0;
+      if ( this->getOwner() != this->getHostID() )
+      {
+        byte flags = 0;
+        SYNCHELP_READ_BYTE( flags, NWT_SS_FLAGS );
+
+        bUp = (flags & MASK_bUp) != 0;
+        bDown = (flags & MASK_bDown) != 0;
+        bLeft = (flags & MASK_bLeft) != 0;
+        bRight = (flags & MASK_bRight) != 0;
+        bAscend = (flags & MASK_bAscend) != 0;
+        bDescend = (flags & MASK_bDescend) != 0;
+        bRollL = (flags & MASK_bRollL) != 0;
+        bRollR = (flags & MASK_bRollR) != 0;
+        
+      }
       
       continue;
@@ -566 +569 @@
     if ( b == DATA_mouse )
     {
-      SYNCHELP_READ_FLOAT( mouseDir.w, NWT_SS_MOUSEDIRW );
-      SYNCHELP_READ_FLOAT( mouseDir.v.x, NWT_SS_MOUSEDIRX );
-      SYNCHELP_READ_FLOAT( mouseDir.v.y, NWT_SS_MOUSEDIRY );
-      SYNCHELP_READ_FLOAT( mouseDir.v.z, NWT_SS_MOUSEDIRZ );
+      if ( this->getOwner() != this->getHostID() )
+      {
+        SYNCHELP_READ_FLOAT( mouseDir.w, NWT_SS_MOUSEDIRW );
+        SYNCHELP_READ_FLOAT( mouseDir.v.x, NWT_SS_MOUSEDIRX );
+        SYNCHELP_READ_FLOAT( mouseDir.v.y, NWT_SS_MOUSEDIRY );
+        SYNCHELP_READ_FLOAT( mouseDir.v.z, NWT_SS_MOUSEDIRZ );
+      }
       
       continue;
@@ -584 +590 @@
     if ( b == DATA_velocity )
     {
-      SYNCHELP_READ_FLOAT( velocity.x, NWT_SS_VELX );
-      SYNCHELP_READ_FLOAT( velocity.y, NWT_SS_VELY );
-      SYNCHELP_READ_FLOAT( velocity.z, NWT_SS_VELZ );
+      if ( this->getOwner() != this->getHostID() )
+      {
+        SYNCHELP_READ_FLOAT( velocity.x, NWT_SS_VELX );
+        SYNCHELP_READ_FLOAT( velocity.y, NWT_SS_VELY );
+        SYNCHELP_READ_FLOAT( velocity.z, NWT_SS_VELZ );
+      }
+      
+      continue;
+    }
+    
+    if ( b == DATA_playables )
+    {
+      if ( this->getOwner() != this->getHostID() )
+        SYNCHELP_READ_FKT( Playable::writeSync, NWT_SS_PL_SYNC );
     }
   }
@@ -616 +633 @@
 
     SYNCHELP_WRITE_FKT( WorldEntity::readState, NWT_SS_WE_STATE );
-    //SYNCHELP_WRITE_FLOAT( cycle );
 
     return SYNCHELP_WRITE_N;
@@ -631 +647 @@
   if ( this->getHostID()==this->getOwner() )
   {
-    int mask = 0;
+    byte mask = 0;
 
     if ( bUp )
@@ -643 +659 @@
     if ( bAscend )
       mask |= MASK_bAscend;
-    if ( bFire )
-      mask |= MASK_bFire;
     if ( bRollL )
       mask |= MASK_bRollL;
@@ -651 +665 @@
 
 
-    //static float oldxMouse = xMouse + 1.0;
-    //static float oldyMouse = yMouse + 1.0;
-
     if ( mask != oldMask )
     {
       oldMask = mask;
       SYNCHELP_WRITE_BYTE( DATA_flags, NWT_SS_B );
-      SYNCHELP_WRITE_INT( mask, NWT_SS_FLAGS );
+      SYNCHELP_WRITE_BYTE( mask, NWT_SS_FLAGS );
     }
 #define __OFFSET_MDIR_W 0.01
@@ -688 +699 @@
       SYNCHELP_WRITE_FLOAT( velocity.z, NWT_SS_VELZ );
     }
+    
+    if ( Playable::needsReadSync() )
+    {
+      SYNCHELP_WRITE_BYTE( DATA_playables, NWT_SS_B );
+      SYNCHELP_WRITE_FKT( Playable::readSync, NWT_SS_PL_SYNC );
+    }
 
   }