Fix current custom gametype not being kept if gametype vote ends without votes

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

diff --git a/qcsrc/server/main.qc b/qcsrc/server/main.qc
index 03306e76d7e0f4019657c2259a74c7caee1f2410..40e14c906bf858e544c321cf475cada1526a9024 100644 (file)
--- a/qcsrc/server/main.qc
+++ b/qcsrc/server/main.qc
@@ -5,6 +5,7 @@
 #include <common/deathtypes/all.qh>
 #include <common/debug.qh>
 #include <common/mapinfo.qh>
+#include <common/mapobjects/_mod.qh>
 #include <common/monsters/sv_monsters.qh>
 #include <common/util.qh>
 #include <common/vehicles/all.qh>
@@ -187,12 +188,14 @@ void CreatureFrame_All()
        });
 }
 
+// called shortly after map change in dedicated
 void Pause_TryPause_Dedicated(entity this)
 {
-       if (player_count == 0)
+       if (player_count == 0 && !intermission_running && !autocvar__endmatch)
                setpause(1);
 }
 
+// called every normal frame in singleplayer/listen
 void Pause_TryPause()
 {
        int n = 0, p = 0;
@@ -207,9 +210,12 @@ void Pause_TryPause()
                setpause(0);
 }
 
+// called every paused frame by DP
 void SV_PausedTic(float elapsedtime)
 {
-       if (!server_is_dedicated)
+       if (autocvar__endmatch) // `endmatch` while paused
+               setpause(0); // proceed to intermission
+       else if (!server_is_dedicated)
        {
                if (autocvar_sv_autopause)
                        Pause_TryPause();
@@ -296,7 +302,6 @@ void StartFrame()
        });
 
        execute_next_frame();
-       if (autocvar_sv_autopause && !server_is_dedicated) Pause_TryPause();
 
        delete_fn = remove_unsafely; // not during spawning!
        serverprevtime = servertime;
@@ -349,6 +354,10 @@ void StartFrame()
        CreatureFrame_All();
        CheckRules_World();
 
+       // after CheckRules_World() as it may set intermission_running, and after RedirectionThink() in case listen server is closing
+       if (autocvar_sv_autopause && !server_is_dedicated && !intermission_running)
+               Pause_TryPause();
+
        if (warmup_stage && !game_stopped && warmup_limit > 0 && time - game_starttime >= warmup_limit) {
                ReadyRestart(true);
                return;
@@ -364,6 +373,7 @@ void StartFrame()
                GlobalStats_update(it);
                if (IS_FAKE_CLIENT(it))
                        PlayerPostThink(it); // DP calls this for real clients only
+               PlayerFrame(it);
        });
 }
 
@@ -485,15 +495,15 @@ Returns string_null if no files match or the map isn't packaged.
 */
 string FindFileInMapPack(string pattern)
 {
-       if(!checkextension("DP_QC_FS_SEARCH_PACKFILE"))
+       if (!checkextension("DP_QC_FS_SEARCH_PACKFILE"))
                return string_null;
 
        string base_pack = whichpack(strcat("maps/", mapname, ".bsp"));
-       if(base_pack == "" || !base_pack) // this map isn't packaged or there was an error
+       if (base_pack == "" || !base_pack) // this map isn't packaged or there was an error
                return string_null;
 
        int glob = search_packfile_begin(pattern, true, true, base_pack);
-       if(glob < 0)
+       if (glob < 0)
                return string_null;
 
        string file = search_getfilename(glob, 0);