Merge remote branch 'origin/master' into samual/updatecommands

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / g_world.qc

diff --git a/qcsrc/server/g_world.qc b/qcsrc/server/g_world.qc
index b7b8114d7e819f38a22e1f2dbad6edd117383195..7fcd14612c81aaec8142a6aef1ef4332b9c14489 100644 (file)
--- a/qcsrc/server/g_world.qc
+++ b/qcsrc/server/g_world.qc
@@ -2041,6 +2041,9 @@ float WinningCondition_RanOutOfSpawns()
        if(have_team_spawns <= 0)
                return WINNING_NO;
 
+       if(autocvar_g_spawn_useallspawns <= 0)
+               return WINNING_NO;
+
        if(!some_spawn_has_been_used)
                return WINNING_NO;