Changeset 8827 in orxonox.OLD for branches/multi_player_map/src/util

Timestamp:

Jun 27, 2006, 2:46:40 PM (19 years ago)

Author:

rennerc

Message:

SpawningPoint works now

Location:

branches/multi_player_map/src/util

Files:

• multiplayer_team_deathmatch.cc (modified) (3 diffs)
• multiplayer_team_deathmatch.h (modified) (1 diff)

branches/multi_player_map/src/util/multiplayer_team_deathmatch.cc

@@ -487 +487 @@
   stats.setPlayableUniqueId( playable.getUniqueID() );
   stats.setModelFileName( playableModel );
+  
+  this->respawnPlayable( &playable, stats.getPreferedTeamId(), 0.0f );
 
   if ( oldPlayable )
@@ -734 +736 @@
   }
   
+  this->respawnPlayable( killedStats.getPlayable(), killedStats.getTeamId(), 3.0f );
+}
+
+/**
+ * this function is called on player respawn
+ * @param userId 
+ */
+void MultiplayerTeamDeathmatch::onRespawn( int userId )
+{
+  if ( userId == SharedNetworkData::getInstance()->getHostID() )
+  {
+    this->bLocalPlayerDead = false;
+    this->hideStats();
+  }
+}
+
+/**
+ * this function is called on player respawn
+ * @param we 
+ */
+void MultiplayerTeamDeathmatch::registerSpawn( WorldEntity * we )
+{
+  onRespawn( we->getOwner() );
+}
+
+void MultiplayerTeamDeathmatch::respawnPlayable( Playable * playable, int teamId, float delay )
+{
   const std::list<BaseObject*> * list = ClassList::getList( CL_SPAWNING_POINT );
   
@@ -744 +773 @@
     SpawningPoint * sp = dynamic_cast<SpawningPoint*>(*it);
     
-    if ( sp->getTeamId() < 0 || sp->getTeamId() == killedStats.getTeamId() )
+    if ( sp->getTeamId() == teamId )
       spList.push_back( sp );
   }
+  
+  if ( spList.size() == 0 )
+  {
+    for ( std::list<BaseObject*>::const_iterator it = list->begin(); it != list->end(); it++ )
+    {
+      SpawningPoint * sp = dynamic_cast<SpawningPoint*>(*it);
+    
+      if ( sp->getTeamId() < 0 )
+        spList.push_back( sp );
+    }
+  }
+  
+  assert( spList.size() != 0 );
  
-  int n = spList.size()*rand();
-  
-  spList[n]->pushEntity( killedStats.getPlayable(), 3 );
-}
-
-/**
- * this function is called on player respawn
- * @param userId 
- */
-void MultiplayerTeamDeathmatch::onRespawn( int userId )
-{
-  if ( userId == SharedNetworkData::getInstance()->getHostID() )
-  {
-    this->bLocalPlayerDead = false;
-    this->hideStats();
-  }
-}
-
-/**
- * this function is called on player respawn
- * @param we 
- */
-void MultiplayerTeamDeathmatch::registerSpawn( WorldEntity * we )
-{
-  onRespawn( we->getOwner() );
-}
-
+  int n = (int)((float)spList.size() * (float)rand()/(float)RAND_MAX);
+  
+  spList[n]->pushEntity( playable, delay );
+}
+

branches/multi_player_map/src/util/multiplayer_team_deathmatch.h

@@ -60 +60 @@
     
     virtual void handleChatMessage( int userId, const std::string & message, int messageType );
+    
+    void respawnPlayable( Playable * playable, int teamId, float delay );
 
   protected: