Fixed: Behavior when there are no free DM startspots

Instead of Con_Error() it just selects one of them.
skyjake · Aug 4, 2011 · 3634ba7 · 3634ba7
1 parent a073ff3
commit 3634ba7
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/doomsday/plugins/common/src/p_start.c b/doomsday/plugins/common/src/p_start.c
@@ -1047,22 +1047,21 @@ void G_DeathMatchSpawnPlayer(int playerNum)
         Con_Error("G_DeathMatchSpawnPlayer: Error, minimum of two "
                   "(deathmatch) mapspots required for deathmatch.");
 
-    for(i = 0; i < 20; ++i)
+#define NUM_TRIES 20
+    for(i = 0; i < NUM_TRIES; ++i)
     {
         const playerstart_t* start =
             &deathmatchStarts[P_Random() % numPlayerDMStarts];
 
-        if(P_CheckSpot(start->pos[VX], start->pos[VY]))
+        // Last attempt will succeed even though blocked.
+        if(P_CheckSpot(start->pos[VX], start->pos[VY]) || i == NUM_TRIES-1)
         {
             spawnPlayer(playerNum, pClass, start->pos[VX], start->pos[VY],
                         start->pos[VZ], start->angle, start->spawnFlags, false,
                         true, true);
             return;
         }
     }
-
-    Con_Error("G_DeathMatchSpawnPlayer: Failed to spawn player %i.",
-              playerNum);
 }
 
 typedef struct {