Merge branch 'z411/bai-server' into LegendaryGuard/bai_mod

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

diff --git a/qcsrc/server/world.qc b/qcsrc/server/world.qc
index 703cd15b92e006857420195c038a2ed564a90103..34c811f12f29712250d20bf327802730826be5db 100644 (file)
--- a/qcsrc/server/world.qc
+++ b/qcsrc/server/world.qc
@@ -301,6 +301,9 @@ void cvar_changes_init()
                BADCVAR("g_tdm");
                BADCVAR("g_tdm_on_dm_maps");
                BADCVAR("g_tdm_teams");
+               BADCVAR("g_tka");
+               BADCVAR("g_tka_on_dm_maps");
+               BADCVAR("g_tka_teams");
                BADCVAR("g_vip");
                BADCVAR("leadlimit");
                BADCVAR("nextmap");
@@ -310,6 +313,8 @@ void cvar_changes_init()
                BADCVAR("g_mapinfo_ignore_warnings");
                BADCVAR("g_maplist_ignore_sizes");
                BADCVAR("g_maplist_sizes_count_bots");
+               //LegendGuard adds BADCVAR(g_*) from Mario/survival 15-02-2021
+               //LegendGuard adds BADCVAR(g_*) from Mario/team_keepaway 15-02-2021
 
                // long
                BADCVAR("hostname");
@@ -1276,7 +1281,7 @@ only called if a time or frag limit has expired
 void NextLevel()
 {
        game_stopped = true;
-       intermission_running = 1; // game over
+       intermission_running = true; // game over
 
        // enforce a wait time before allowing changelevel
        if(player_count > 0)