Changeset 7118 in orxonox.OLD for trunk/src/util

Timestamp:

Feb 8, 2006, 9:59:21 AM (19 years ago)

Author:

patrick

Message:

trunk: mp explosion

File:

• trunk/src/util/multiplayer_team_deathmatch.cc (modified) (5 diffs)

trunk/src/util/multiplayer_team_deathmatch.cc

@@ -184 +184 @@
   }
 
-  
+
   if ( SharedNetworkData::getInstance()->isGameServer() )
   {
@@ -190 +190 @@
     float offsety = 323.0f;
     float offsetz = 200.0f;
-    
+
     offsetz += 10;
-    
+
     Terrain * terrain = dynamic_cast<Terrain*>(*(ClassList::getList( CL_TERRAIN )->begin()));
     const std::list<BaseObject*> * list = ClassList::getList( CL_SPACE_SHIP );
@@ -209 +209 @@
       //PRINTF(0)("x = %f, y = %f, z = %f, height = %f\n", terrx, terry, terrz, terrain->getHeight( terrx, terry ));
       //ss->setRelCoorSoft( ss->getAbsCoor().x, terrain->getHeight( terrx, terry )-offsety, ss->getAbsCoor().z );
-      
+
       float dist = (dynamic_cast<Playable*>(*it)->getAbsCoor() - big_left).len();
       if( (dynamic_cast<Playable*>(*it)->getAbsCoor() - big_left).len() > rBig &&
@@ -215 +215 @@
            (dynamic_cast<Playable*>(*it)->getAbsCoor() - small_left).len() > rSmall &&
            (dynamic_cast<Playable*>(*it)->getAbsCoor() - small_middle).len() > rSmall &&
-           (dynamic_cast<Playable*>(*it)->getAbsCoor() - small_right).len() > rSmall)
+           (dynamic_cast<Playable*>(*it)->getAbsCoor() - small_right).len() > rSmall
+           && ss->getAbsCoor().x > -1000)
       {
         PRINTF(0)("KILLLLLLLL\n");
@@ -221 +222 @@
         if((*it)->isA(CL_SPACE_SHIP))
         {
-          dynamic_cast<SpaceShip*>(*it)->networkCollisionList.push_back(116369220.33434f);
-          dynamic_cast<SpaceShip*>(*it)->doCollideNetwork(116369220.33434f);
+          dynamic_cast<SpaceShip*>(*it)->networkCollisionList.push_back(1163692);
+          dynamic_cast<SpaceShip*>(*it)->doCollideNetwork(11636922);
         }
       }