Changeset 8860 in orxonox.OLD

Timestamp:

Jun 28, 2006, 3:09:54 PM (18 years ago)

Author:

rennerc

Message:

removed segfault when killing npc

Location:

branches/multi_player_map/src/util

Files:

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

branches/multi_player_map/src/util/multiplayer_team_deathmatch.cc

@@ -223 +223 @@
   while ( this->killList.begin() != this->killList.end() )
   {
-    if ( this->killList.begin()->getKiller() != NULL && this->killList.begin()->getVictim() != NULL )
-      onKill( this->killList.begin()->getKiller()->getOwner(), this->killList.begin()->getVictim()->getOwner() );
+    onKill( this->killList.begin()->getVictim(), this->killList.begin()->getKiller() );
     this->killList.erase( this->killList.begin() );
   }
@@ -559 +558 @@
   else if ( event.type == SDLK_TAB )
   {
-    if ( currentGameState == GAMESTATE_GAME && !event.bPressed && !EventHandler::getInstance()->isPressed( SDLK_RALT ) && !EventHandler::getInstance()->isPressed( SDLK_LALT ) )
+    if ( currentGameState == GAMESTATE_GAME && event.bPressed && !EventHandler::getInstance()->isPressed( SDLK_RALT ) && !EventHandler::getInstance()->isPressed( SDLK_LALT ) )
     {
       EventHandler::getInstance()->pushState( ES_MENU );
@@ -716 +715 @@
  * @param userId
  */
-void MultiplayerTeamDeathmatch::onKill( int killedUserId, int userId )
-{
-  assert( PlayerStats::getStats( killedUserId ) );
-  assert( PlayerStats::getStats( userId ) );
-
-  PlayerStats & killedStats = *PlayerStats::getStats( killedUserId );
-  PlayerStats & stats = *PlayerStats::getStats( userId );
+void MultiplayerTeamDeathmatch::onKill( WorldEntity * victim, WorldEntity * killer )
+{
+  if ( !victim )
+    return;
+  if ( !killer )
+    return;
+  
+  int killerUserId = killer->getOwner();
+  int victimUserId = victim->getOwner();
+
+  PlayerStats & victimStats = *PlayerStats::getStats( victimUserId );
+  PlayerStats & killerStats = *PlayerStats::getStats( killerUserId );
+  
+  if ( killerStats.getPlayable() != killer || victimStats.getPlayable() != victim )
+    return;
 
   //check for suicide
-  if ( killedUserId != userId )
+  if ( killerUserId != victimUserId )
   {
     //check for teamkill
-    if ( stats.getTeamId() != killedStats.getTeamId() )
-    {
-      stats.setScore( stats.getScore() + 1 );
+    if ( victimStats.getTeamId() != killerStats.getTeamId() )
+    {
+      killerStats.setScore( killerStats.getScore() + 1 );
     }
     else
     {
-      stats.setScore( stats.getScore() - 1 );
+      killerStats.setScore( killerStats.getScore() - 1 );
     }
   }
   else
-    stats.setScore( stats.getScore() - 1 );
-
-  if ( killedUserId == SharedNetworkData::getInstance()->getHostID() )
+    killerStats.setScore( killerStats.getScore() - 1 );
+
+  if ( victimUserId == SharedNetworkData::getInstance()->getHostID() )
   {
     this->bLocalPlayerDead = true;
@@ -746 +753 @@
   }
 
-  this->respawnPlayable( killedStats.getPlayable(), killedStats.getTeamId(), 3.0f );
+  this->respawnPlayable( victimStats.getPlayable(), victimStats.getTeamId(), 3.0f );
 }
 

branches/multi_player_map/src/util/multiplayer_team_deathmatch.h

@@ -56 +56 @@
     virtual void process(const Event &event);
     
-    void onKill( int killedUserId, int userId );
+    void onKill( WorldEntity * victim, WorldEntity * killer );
     void onRespawn( int userId );