Changeset 9650 in orxonox.OLD for branches

Timestamp:

Jul 31, 2006, 3:03:15 PM (18 years ago)

Author:

patrick

Message:

the network mode shoudl support kills again

Location:

branches/proxy/src

Files:

• util/multiplayer_team_deathmatch.cc (modified) (1 diff)
• world_entities/playable.cc (modified) (2 diffs)
• world_entities/space_ships/turbine_hover.cc (modified) (2 diffs)
• world_entities/weapons/laser_cannon.cc (modified) (1 diff)
• world_entities/weapons/test_gun.cc (modified) (1 diff)

branches/proxy/src/util/multiplayer_team_deathmatch.cc

@@ -758 +758 @@
   PlayerStats & killerStats = *PlayerStats::getStats( killerUserId );
 
-  if ( killerStats.getPlayable() != killer || victimStats.getPlayable() != victim )
-  {
-    PRINTF(0)("killerStats.getPlayable() != killer || victimStats.getPlayable() != victim\n");
+  if ( killerStats.getPlayable() != NULL || victimStats.getPlayable() != NULL)
+  {
+    PRINTF(0)("killerStats.getPlayable() != NULL || victimStats.getPlayable() != NULL\n");
     PRINTF(0)("%x %x %x %x\n", killerStats.getPlayable(), killer, victimStats.getPlayable(), victim );
     PRINTF(0)("%d %d %d %d\n", killerStats.getPlayable()->getUniqueID(), killer->getUniqueID(), victimStats.getPlayable()->getUniqueID(), victim->getUniqueID() );

branches/proxy/src/world_entities/playable.cc

@@ -69 +69 @@
 
   this->teamChangeHandler = registerVarId( new SynchronizeableInt( &this->teamId, &this->teamId, "team-id", PERMISSION_MASTER_SERVER ) );
+
   registerVar( new SynchronizeableInt( &score, &score, "score", PERMISSION_MASTER_SERVER ) );
   registerVar( new SynchronizeableBool( &bFire, &bFire, "bFire", PERMISSION_OWNER));
@@ -140 +141 @@
 bool Playable::addWeapon(Weapon* weapon, int configID, int slotID)
 {
+  weapon->setOwner(this->getOwner());
+
+
   if(this->weaponMan.addWeapon(weapon, configID, slotID))
   {

branches/proxy/src/world_entities/space_ships/turbine_hover.cc

@@ -277 +277 @@
   printf("::::::::::::::::: TEAM ::: %d\n", teamID);
   if (teamID == 0)
+  {
     this->setBoostColor(Color::blue);
+  }
   else if (teamID == 1)
+  {
     this->setBoostColor(Color::red);
-
+  }
+
+  ///HACK this is very much hard coded.set the owner of the weapons
+  this->getWeaponManager().getWeapon(0)->setOwner(/*SharedNetworkData::getInstance()->getHostID()*/ this->getOwner());
+  this->getWeaponManager().getWeapon(1)->setOwner(/*SharedNetworkData::getInstance()->getHostID()*/this->getOwner());
 
   //choose collision list
@@ -290 +297 @@
       toList( OM_GROUP_01);
   }
+
 
   // set the local team id, very important

branches/proxy/src/world_entities/weapons/laser_cannon.cc

@@ -121 +121 @@
     return;
 
+  // make this to let the onKill(...) fuction get the stuff
+  pj->setOwner(this->getOwner());
+
   pj->setParent(PNode::getNullParent());
 

branches/proxy/src/world_entities/weapons/test_gun.cc

@@ -177 +177 @@
   if (pj == NULL)
     return;
+
+  // set the owner
+  pj->setOwner(this->getOwner());
 
   pj->setParent(PNode::getNullParent());