Changeset 6937 in orxonox.OLD for branches/network/src/world_entities/playable.cc

Timestamp:

Feb 1, 2006, 2:32:16 PM (20 years ago)

Author:

patrick

Message:

network: implemented network cd system

File:

• branches/network/src/world_entities/playable.cc (modified) (4 diffs)

branches/network/src/world_entities/playable.cc

@@ -101 +101 @@
 void Playable::collidesWith(WorldEntity* entity, const Vector& location)
 {
-  if (entity->isA(CL_PROJECTILE))
+  if (entity->isA(CL_PROJECTILE) && !State::isOnline() )
     this->decreaseHealth(entity->getHealth());
 
@@ -253 +253 @@
 {
   SYNCHELP_READ_BEGIN();
-  
+
   byte flags;
-  
+
   SYNCHELP_READ_BYTE( flags, NWT_PL_FLAGS );
-  
+
   bFire = (flags & FLAGS_bFire) != 0;
-  
+
   return SYNCHELP_READ_N;
 }
@@ -267 +267 @@
   SYNCHELP_WRITE_BEGIN();
   byte flags = 0;
-  
+
   if ( bFire )
     flags |= FLAGS_bFire;
-  
+
 
   SYNCHELP_WRITE_BYTE( flags, NWT_PL_FLAGS );
   oldFlags = flags;
 
-  
+
   return SYNCHELP_WRITE_N;
 }
@@ -282 +282 @@
 {
   byte flags = 0;
-  
+
   if ( bFire )
     flags |= FLAGS_bFire;
-  
+
   return flags!=oldFlags;
 }