Fix out of bounds access in Spawnpoints::Create

Also bump the maximum number of indicators to 64

Author: viciious

gametypes/ctf/ctf_main.as

@@ -748,7 +748,7 @@ void GT_MatchStateStarted()
 
  case MATCH_STATE_COUNTDOWN:
  GENERIC_SetUpCountdown();
-SpawnIndicators::Delete();
+SpawnIndicators::DeleteAll();
  firstSpawn = true;
  break;
 

gametypes/ctftactics/ctf_main.as

@@ -804,7 +804,7 @@ void GT_MatchStateStarted()
 
  case MATCH_STATE_COUNTDOWN:
  GENERIC_SetUpCountdown();
-SpawnIndicators::Delete();
+SpawnIndicators::DeleteAll();
  break;
 
  case MATCH_STATE_PLAYTIME:

gametypes/dm.as

@@ -412,7 +412,7 @@ void GT_MatchStateStarted()
  gametype.pickableItemsMask = 0; // disallow item pickup
  gametype.dropableItemsMask = 0; // disallow item drop
  GENERIC_SetUpCountdown();
-SpawnIndicators::Delete();
+SpawnIndicators::DeleteAll();
  break;
 
  case MATCH_STATE_PLAYTIME:

gametypes/duel.as

@@ -387,7 +387,7 @@ void GT_MatchStateStarted()
  gametype.pickableItemsMask = 0; // disallow item pickup
  gametype.dropableItemsMask = 0; // disallow item drop
  GENERIC_SetUpCountdown();
-SpawnIndicators::Delete();
+SpawnIndicators::DeleteAll();
  break;
 
  case MATCH_STATE_PLAYTIME:

gametypes/ffa.as

@@ -309,7 +309,7 @@ void GT_MatchStateStarted()
  gametype.pickableItemsMask = 0; // disallow item pickup
  gametype.dropableItemsMask = 0; // disallow item drop
  GENERIC_SetUpCountdown();
-SpawnIndicators::Delete();
+SpawnIndicators::DeleteAll();
  break;
 
  case MATCH_STATE_PLAYTIME:

gametypes/generic/spawnpoints.as

@@ -20,7 +20,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 // CPM-style spawn indicators for warmup. 
 // Add from gametype scripts with:
 // CreateSpawnIndicators(<spawn entity>,TEAM_PLAYERS/TEAM_ALPHA/TEAM_BETA)
-// And remember to remove indicators after warmup: SpawnIndicators::Delete()
+// And remember to remove indicators after warmup: SpawnIndicators::DeleteAll()
 
 class Spawnpoint
 {
@@ -95,7 +95,7 @@ class Spawnpoint
 namespace SpawnIndicators
 {
 
-const int MAX_INDICATORS = 32;
+const uint MAX_INDICATORS = 64;
 array<Spawnpoint @> indicators(MAX_INDICATORS);
 uint numIndicators = 0;
 
@@ -112,8 +112,8 @@ void Create( const String &className, int team )
 array<Entity @> @ents = G_FindByClassname( className );
 
 uint maxIndicators = ents.size();
-if( maxIndicators > MAX_INDICATORS )
-maxIndicators = MAX_INDICATORS;
+if( numIndicators + maxIndicators > MAX_INDICATORS )
+maxIndicators = MAX_INDICATORS - numIndicators;
 
 for( uint i = 0; i < maxIndicators; i++ )
  {
@@ -123,7 +123,7 @@ void Create( const String &className, int team )
  }
 }
 
-void Delete()
+void DeleteAll()
 {
 for( uint i = 0; i < numIndicators; i++ ) {
 @indicators[i] = null;

gametypes/headhunt.as

@@ -645,7 +645,7 @@ void GT_MatchStateStarted()
  gametype.pickableItemsMask = 0; // disallow item pickup
  gametype.dropableItemsMask = 0; // disallow item drop
  GENERIC_SetUpCountdown();
-SpawnIndicators::Delete();
+SpawnIndicators::DeleteAll();
  break;
 
  case MATCH_STATE_PLAYTIME:

gametypes/tdm.as

@@ -439,7 +439,7 @@ void GT_MatchStateStarted()
  gametype.dropableItemsMask = 0; // disallow item drop
 
  GENERIC_SetUpCountdown();
-SpawnIndicators::Delete();
+SpawnIndicators::DeleteAll();
  break;
 
  case MATCH_STATE_PLAYTIME: