* (bug 4325) Last spawn deconstruction check ignores available marked build points (Rezyn)

1 files changed, 12 insertions, 0 deletions

diff --git a/src/game/g_buildable.c b/src/game/g_buildable.c
index 08a39062..964c76bb 100644
--- a/src/game/g_buildable.c
+++ b/src/game/g_buildable.c
@@ -2834,6 +2834,18 @@ static int G_CompareBuildablesForRemoval( const void *a, const void *b )
   else if( !aMatches && bMatches )
     return 1;
 
+  // If the only spawn is marked, prefer it last
+  if( cmpBuildable == BA_A_SPAWN || cmpBuildable == BA_H_SPAWN )
+  {
+    if( ( buildableA->s.modelindex == BA_A_SPAWN && level.numAlienSpawns == 1 ) ||
+        ( buildableA->s.modelindex == BA_H_SPAWN && level.numHumanSpawns == 1 ) )
+      return 1;
+
+    if( ( buildableB->s.modelindex == BA_A_SPAWN && level.numAlienSpawns == 1 ) ||
+        ( buildableB->s.modelindex == BA_H_SPAWN && level.numHumanSpawns == 1 ) )
+      return -1;
+  }
+
   // If one matches the thing we're building, prefer it
   aMatches = ( buildableA->s.modelindex == cmpBuildable );
   bMatches = ( buildableB->s.modelindex == cmpBuildable );