Changeset 9008 in orxonox.OLD for trunk/src/world_entities/world_entity.cc

Timestamp:

Jul 2, 2006, 2:22:19 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the network bak to the trunk
merged with command:
svn merge -r8804:HEAD ​https://svn.orxonox.net/orxonox/branches/multi_player_map .

conflicts all resolved in favour of the branche

File:

• trunk/src/world_entities/world_entity.cc (modified) (4 diffs)

trunk/src/world_entities/world_entity.cc

@@ -88 +88 @@
   modelFileName_handle = registerVarId( new SynchronizeableString( &modelFileName, &modelFileName, "modelFileName" ) );
   scaling_handle = registerVarId( new SynchronizeableFloat( &scaling, &scaling, "scaling" ) );
+  list_handle = registerVarId( new SynchronizeableInt( (int*)&objectListNumber, &list_write, "list" ) );
 }
 
@@ -733 +734 @@
  *  @param damage damage to be dealt
  */
-void WorldEntity::hit(float damage)
+void WorldEntity::hit(float damage, WorldEntity* killer)
 {
   this->decreaseHealth(damage);
@@ -748 +749 @@
 
     if( State::getGameRules() != NULL)
-      State::getGameRules()->registerKill(Kill(NULL, this));
+      State::getGameRules()->registerKill(Kill(killer, this));
   }
 }
@@ -832 +833 @@
   }
 
+  if ( std::find( id.begin(), id.end(), list_handle ) != id.end() )
+  {
+    this->toList( (OM_LIST)list_write );
+  }
+
   PNode::varChangeHandler( id );
 }