Changeset 8827 in orxonox.OLD

Timestamp:

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

Author:

rennerc

Message:

SpawningPoint works now

Location:

branches/multi_player_map/src

Files:

• lib/network/network_game_manager.cc (modified) (2 diffs)
• util/multiplayer_team_deathmatch.cc (modified) (3 diffs)
• util/multiplayer_team_deathmatch.h (modified) (1 diff)
• world_entities/playable.cc (modified) (1 diff)
• world_entities/space_ships/space_ship.cc (modified) (1 diff)
• world_entities/space_ships/space_ship.h (modified) (1 diff)
• world_entities/spawning_point.cc (modified) (8 diffs)
• world_entities/spawning_point.h (modified) (4 diffs)

branches/multi_player_map/src/lib/network/network_game_manager.cc

@@ -39 +39 @@
 
 #include "network_game_manager.h"
+
+#include "multiplayer_team_deathmatch.h"
 
 
@@ -118 +120 @@
   stats->setPlayableUniqueId( playable.getUniqueID() );
   stats->setModelFileName( playableModel );
+  
+  if ( rules.isA( CL_MULTIPLAYER_TEAM_DEATHMATCH ) )
+    dynamic_cast<MultiplayerTeamDeathmatch*>(&rules)->respawnPlayable( &playable, team, 0.0f );
   
   return true;

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:

branches/multi_player_map/src/world_entities/playable.cc

@@ -392 +392 @@
     State::getGameRules()->onPlayerSpawn();
 
-
-  if( this->getOwner() % 2 == 0)
-  {
-    //     this->toList(OM_GROUP_00);
-    this->setAbsCoor(213.37, 57.71, -47.98);
-    this->setAbsDir(0, 0, 1, 0);
-  }
-  else
-  { // red team
-    //     this->toList(OM_GROUP_01);
-    this->setAbsCoor(-314.450, 40.701, 83.554);
-    this->setAbsDir(1.0, -0.015, -0.012, 0.011);
-  }
   this->reset();
   this->bDead = false;

branches/multi_player_map/src/world_entities/space_ships/space_ship.cc

@@ -504 +504 @@
 }
 
-
-
-
+void SpaceShip::destroy( )
+{
+  PRINTF(0)("spaceship destroy\n");
+}
+
+void SpaceShip::respawn( )
+{
+  toList( OM_PLAYERS );
+}
+
+
+
+

branches/multi_player_map/src/world_entities/space_ships/space_ship.h

@@ -36 +36 @@
     virtual void postSpawn();
     virtual void leftWorld();
+    
+    virtual void destroy();
+    virtual void respawn();
 
     virtual void collidesWith(WorldEntity* entity, const Vector& location);

branches/multi_player_map/src/world_entities/spawning_point.cc

@@ -22 +22 @@
 #include "world_entity.h"
 
+#include "class_list.h"
+
 #include "compiler.h"
 
@@ -34 +36 @@
  *  constructor
  */
-SpawningPoint::SpawningPoint (ClassID classid, const Vector& position)
-{
-  this->setAbsCoor(position);
-
-  this->init();
-}
-
-
-/**
- *  standard constructor
- */
-SpawningPoint::SpawningPoint (const Vector& position, ClassID classid, SpawningPointMode mode, float delay)
-{
-  this->setAbsCoor(position);
-
-  this->init();
-}
-
-
 SpawningPoint::SpawningPoint( const TiXmlElement * root )
 {
@@ -69 +52 @@
   
   this->teamId = -1;
+  this->localTimer = 0.0f;
+  
+  this->toList( OM_DEAD_TICK );
   
   MessageManager::getInstance()->registerMessageHandler( MSGID_RESPAWN, respawnMessageHandler, NULL );
@@ -101 +87 @@
  *  @param entity WorldEntity to be added
  */
-void SpawningPoint::pushEntity(WorldEntity* entity, float delay)
+void SpawningPoint::pushEntity(Playable* entity, float delay)
 {
   QueueEntry qe;
@@ -114 +100 @@
  *  spawn the entity
  */
-void SpawningPoint::spawn(WorldEntity* entity)
-{
-  PRINTF(1)("Spawningpoint spawns new Entity (%s)\n", entity->getClassName());
+void SpawningPoint::spawn(Playable* entity)
+{
+  PRINTF(0)("Spawningpoint spawns Entity (%s)\n", entity->getClassName());
 
 
@@ -128 +114 @@
     (State::getGameRules())->registerSpawn( entity );
   }
+  
+  entity->respawn();
 }
 
@@ -140 +128 @@
 {
   this->localTimer += dt;
-
   std::list<QueueEntry>::iterator it = this->queue.begin();
   for( ; it != this->queue.end(); )
   {
-    
+    //PRINTF(0)("%f <= %f\n", it->respawnTime, this->localTimer);
     if( it->respawnTime <= this->localTimer)
     {
@@ -207 +194 @@
   assert( Converter::byteArrayToInt( data+INTSIZE, &uniqueId ) == INTSIZE );
   
-  //TODO find Playable and SpawningPoint and spawn Playable
+  SpawningPoint * sp = NULL;
+  Playable      * playable = NULL;
+  
+  const std::list<BaseObject*> * list = ClassList::getList( CL_SPAWNING_POINT );
+  
+  if ( list )
+  {
+    for ( std::list<BaseObject*>::const_iterator it = list->begin(); it != list->end(); it++ )
+    {
+      if ( dynamic_cast<SpawningPoint*>(*it)->getUniqueID() == uniqueId )
+      {
+        sp = dynamic_cast<SpawningPoint*>(*it);
+        break;
+      }
+    }
+  }
+  
+  if ( !sp )
+  {
+    PRINTF(2)("could not find spawning point\n");
+    return false;
+  }
+  
+  list = ClassList::getList( CL_PLAYABLE );
+  
+  if ( list )
+  {
+    for ( std::list<BaseObject*>::const_iterator it = list->begin(); it != list->end(); it++ )
+    {
+      if ( dynamic_cast<Playable*>(*it)->getUniqueID() == uniqueId )
+      {
+        playable = dynamic_cast<Playable*>(*it);
+        break;
+      }
+    }
+  }
+  
+  if ( !playable )
+  {
+    PRINTF(2)("could not find playable\n");
+    return false;
+  }
+  
+  sp->spawn( playable );
   
   return true;

branches/multi_player_map/src/world_entities/spawning_point.h

@@ -20 +20 @@
 {
   float respawnTime;
-  WorldEntity * entity;
+  Playable * entity;
 };
 
@@ -45 +45 @@
   public:
     SpawningPoint(const TiXmlElement* root = NULL);
-    SpawningPoint(ClassID classID, const Vector& position = Vector(0.0, 0.0, 0.0));
-    SpawningPoint(const Vector& position, ClassID classID, SpawningPointMode type, float delay);
     virtual ~SpawningPoint ();
     void init();
@@ -55 +53 @@
     inline void setTeamId( int teamId ){ this->teamId = teamId; }
 
-    void pushEntity(WorldEntity* entity, float delay = 0);
+    void pushEntity(Playable* entity, float delay = 0);
 
     /** activates the spawning point */
@@ -69 +67 @@
 
   private:
-    void spawn(WorldEntity* entity);
+    void spawn(Playable* entity);
     
     void sendRespawnMessage( int uniqueId );