Changeset 8856 in orxonox.OLD

Timestamp:

Jun 28, 2006, 2:43:05 PM (18 years ago)

Author:

rennerc

Message:

fixed segfault

Location:

branches/multi_player_map/src/util

Files:

• game_rules.cc (modified) (1 diff)
• game_rules.h (modified) (2 diffs)
• multiplayer_team_deathmatch.cc (modified) (2 diffs)

branches/multi_player_map/src/util/game_rules.cc

@@ -92 +92 @@
 
   PRINTF(0)("Received Event: Kill\n");
-//   this->killList.push_back(kill);
+
+  this->killList.push_back( kill );
 }
 

branches/multi_player_map/src/util/game_rules.h

@@ -9 +9 @@
 
 #include "base_object.h"
+#include <list>
 #include <vector>
 
@@ -54 +55 @@
     std::vector<MissionGoal*>   missionList;            //!< list of mission goals
 
-    std::vector<Kill>          killList;               //!<  list of kills in the world
+    std::list<Kill>             killList;               //!<  list of kills in the world
 };
 

branches/multi_player_map/src/util/multiplayer_team_deathmatch.cc

@@ -68 +68 @@
   this->numTeams = 2;
   this->currentGameState = GAMESTATE_PRE_GAME;
-  this->gameStateTimer = 10.0f;
+  this->gameStateTimer = 3.0f;
   this->bShowTeamChange = false;
 
@@ -221 +221 @@
 
   //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 );
-  }
+  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() );
+    this->killList.erase( this->killList.begin() );
+  }
+  
+
 
   gameStateTimer -= dt;