]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge remote-tracking branch 'origin/master' into pending-release
authorbones_was_here <bones_was_here@xonotic.au>
Sun, 28 May 2023 04:38:13 +0000 (14:38 +1000)
committerbones_was_here <bones_was_here@xonotic.au>
Sun, 28 May 2023 04:38:13 +0000 (14:38 +1000)
1  2 
.gitlab-ci.yml
qcsrc/server/world.qc

diff --combined .gitlab-ci.yml
index 61a2cfef5385d969147165cbabd609e8988ebdf5,1feae253cbcd4231b69ae551e0466917e3ee043e..58d1e45823ba3579e85304b567163ae4a00c6a47
@@@ -75,7 -75,7 +75,7 @@@ test_sv_game
      - wget -nv -O data/maps/stormkeep.waypoints https://gitlab.com/xonotic/xonotic-maps.pk3dir/raw/master/maps/stormkeep.waypoints\r
      - wget -nv -O data/maps/stormkeep.waypoints.cache https://gitlab.com/xonotic/xonotic-maps.pk3dir/raw/master/maps/stormkeep.waypoints.cache\r
  \r
-     - EXPECT=e7c012825007ed251efa4e52dfbb592e\r
 -    - EXPECT=20c9c4ea0364fbb611656cc0b876e02b\r
++    - EXPECT=b4bfc34b5a52ba950de9814c2c52c1c3\r
      - HASH=$(${ENGINE} +exec serverbench.cfg\r
        | tee /dev/stderr\r
        | grep '^:'\r
diff --combined qcsrc/server/world.qc
index b6e088d8c641e5f033840b7733a9afeca7fb40b0,56d293f98076b0091ffdd50efb848f6a5142dec0..db614661cf2c3f80a4efc7d2b4467cd963ac67af
@@@ -305,10 -305,6 +305,10 @@@ void cvar_changes_init(
                BADCVAR("g_tdm");
                BADCVAR("g_tdm_on_dm_maps");
                BADCVAR("g_tdm_teams");
 +              BADCVAR("g_tka");
 +              BADCVAR("g_tka_on_ka_maps");
 +              BADCVAR("g_tka_on_tdm_maps");
 +              BADCVAR("g_tka_teams");
                BADCVAR("g_tmayhem");
                BADCVAR("g_tmayhem_teams");
                BADCVAR("g_vip");
@@@ -691,7 -687,7 +691,7 @@@ void GameplayMode_DelayedInit(entity th
  
  void InitGameplayMode()
  {
-       VoteReset();
+       VoteReset(false);
  
        // find out good world mins/maxs bounds, either the static bounds found by looking for solid, or the mapinfo specified bounds
        get_mi_min_max(1);
@@@ -1341,7 -1337,7 +1341,7 @@@ void NextLevel(
  
        //pos = FindIntermission ();
  
-       VoteReset();
+       VoteReset(true);
  
        DumpStats(true);