Changeset 8798 in orxonox.OLD

Timestamp:

Jun 26, 2006, 3:48:47 PM (18 years ago)

Author:

rennerc

Message:

network changes

Location:

branches/network/src

Files:

• util/game_rules.cc (modified) (2 diffs)
• util/multiplayer_team_deathmatch.cc (modified) (4 diffs)
• world_entities/spawning_point.cc (modified) (2 diffs)
• world_entities/spawning_point.h (modified) (2 diffs)

branches/network/src/util/game_rules.cc

@@ -21 +21 @@
 
 #include "util/mission_goal.h"
+
+#include "shared_network_data.h"
 
 #include "debug.h"
@@ -86 +88 @@
 void GameRules::registerKill(const Kill& kill)
 {
+  if ( !SharedNetworkData::getInstance()->isGameServer() )
+    return;
   PRINTF(0)("Received Event: Kill\n");
   this->killList.push_back(kill);

branches/network/src/util/multiplayer_team_deathmatch.cc

@@ -45 +45 @@
 
 #include "shell_command.h"
+
+#include "spawning_point.h"
 
 
@@ -237 +239 @@
   if ( !SharedNetworkData::getInstance()->isGameServer() )
     return;
+    
+  //handle kills
+  for ( std::vector<Kill>::iterator it = this->killList.begin(); it != this->killList.end();  )
+  {
+    std::vector<Kill>::iterator delit = it;
+    
+    onKill( it->getKiller()->getOwner(), it->getVictim()->getOwner() );
+    
+    it++;
+    killList.erase( delit );
+  }
   
   gameStateTimer -= dt;
@@ -735 +748 @@
     stats.setScore( stats.getScore() - 1 );
   
-  killedStats.getPlayable()->toList( OM_DEAD );
-  
   if ( killedUserId == SharedNetworkData::getInstance()->getHostID() )
   {
@@ -743 +754 @@
   }
   
-  //TODO respawn killed palyer
+  const std::list<BaseObject*> * list = ClassList::getList( CL_SPAWNING_POINT );
+  
+  assert( list );
+  
+  std::vector<SpawningPoint*> spList;
+  
+  for ( std::list<BaseObject*>::const_iterator it = list->begin(); it != list->end(); it++ )
+  {
+    SpawningPoint * sp = dynamic_cast<SpawningPoint*>(*it);
+    
+    if ( sp->getTeamId() < 0 || sp->getTeamId() == killedStats.getTeamId() )
+      spList.push_back( sp );
+  }
  
+  int n = spList.size()*rand();
+  
+  spList[n]->pushEntity( killedStats.getPlayable(), 3 );
 }
 

branches/network/src/world_entities/spawning_point.cc

@@ -59 +59 @@
 {
   this->setClassID(CL_SPAWNING_POINT, "SpawningPoint");
+  
+  this->teamId = -1;
 }
 
@@ -81 +83 @@
   LoadParam(root, "delay", this, SpawningPoint, setSpawningDelay)
       .describe("sets the delay of the spawning point");
+      
+  /* load teamId */
+  LoadParam(root, "teamId", this, SpawningPoint, setTeamId)
+      .describe("sets teamId");
 
 

branches/network/src/world_entities/spawning_point.h

@@ -50 +50 @@
     /** sets the spawning point mode @param mode: the mode */
     void SpawningPoint::setSpawningMode(int mode) { this->mode = (SpawningPointMode)mode; }
+    
+    inline int getTeamId(){ return this->teamId; }
+    inline void setTeamId( int teamId ){ this->teamId = teamId; }
 
     void pushEntity(WorldEntity* entity, float delay = 0);
@@ -72 +75 @@
     float                           localTimer;                     //!< the local timer
     float                           seed;                           //!< the random seed of the position
+    int                             teamId;                         //!< only spawn players of this team
     ClassID                         classid;                        //!< the classid of the entity to spawn
     SpawningPointMode               mode;                           //!< the mode of the spawning point