Changeset 6753 in orxonox.OLD for trunk/src/world_entities

Timestamp:

Jan 26, 2006, 1:08:23 AM (18 years ago)

Author:

patrick

Message:

trunk: merged network back to trunk

Location:

trunk/src/world_entities

Files:

• projectiles/laser.cc (modified) (1 diff)
• space_ships/space_ship.cc (modified) (3 diffs)
• weapons/weapon_manager.cc (modified) (1 diff)

trunk/src/world_entities/projectiles/laser.cc

@@ -30 +30 @@
 #include <cassert>
 
-#include "assert.h"
+#include <cassert>
 
 

trunk/src/world_entities/space_ships/space_ship.cc

@@ -289 +289 @@
   this->weaponAction();
 
-  if( ( xMouse != 0 || yMouse != 0 ) && this->getOwner()==this->getHostID() )
+  if( ( xMouse != 0 || yMouse != 0 ) && this->getOwner() == this->getHostID() )
    {
     if (xMouse > controlVelocityX) xMouse = controlVelocityX;
@@ -555 +555 @@
       SYNCHELP_READ_INT( 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;
+      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;
 
     }
@@ -570 +570 @@
     if ( b == DATA_mouse /*&& this->getHostID()!=this->getOwner()*/ )
     {
-      float asdf;
-      SYNCHELP_READ_FLOAT( asdf );
-      SYNCHELP_READ_FLOAT( asdf );
-      SYNCHELP_READ_FLOAT( asdf );
-      SYNCHELP_READ_FLOAT( asdf );
-      //SYNCHELP_READ_FLOAT( mouseDir.w );
-      //SYNCHELP_READ_FLOAT( mouseDir.v.x );
-      //SYNCHELP_READ_FLOAT( mouseDir.v.y );
-      //SYNCHELP_READ_FLOAT( mouseDir.v.z );
+      SYNCHELP_READ_FLOAT( mouseDir.w );
+      SYNCHELP_READ_FLOAT( mouseDir.v.x );
+      SYNCHELP_READ_FLOAT( mouseDir.v.y );
+      SYNCHELP_READ_FLOAT( mouseDir.v.z );
     }
   } while( b != 0 );

trunk/src/world_entities/weapons/weapon_manager.cc

@@ -217 +217 @@
 bool WeaponManager::addWeapon(Weapon* weapon, int configID, int slotID)
 {
-  //if ( weapon == NULL )
+  if ( weapon == NULL )
     return false;