Properly prevent swallowing more players than your maximum capacity

[voretournament/voretournament.git] / data / qcsrc / server / miscfunctions.qc

diff --git a/data/qcsrc/server/miscfunctions.qc b/data/qcsrc/server/miscfunctions.qc
index 0ccaa0ffb61b13c5ab3b23d6060c01623dae77ed..d8c72f49cb03da9f54469147ba68ac5063bbcca4 100644 (file)
--- a/data/qcsrc/server/miscfunctions.qc
+++ b/data/qcsrc/server/miscfunctions.qc
@@ -1017,7 +1017,6 @@ void readlevelcvars(void)
        g_norecoil = cvar("g_norecoil");\r
        g_vampire = cvar("g_vampire");\r
        g_bloodloss = cvar("g_bloodloss");\r
-       g_balance_vore_swallow_limit = bound(1, cvar("g_balance_vore_swallow_limit"), 9); // may only range between 1 and 9\r
        sv_maxidle = cvar("sv_maxidle");\r
        sv_maxidle_spectatorsareidle = cvar("sv_maxidle_spectatorsareidle");\r
        sv_pogostick = cvar("sv_pogostick");\r
@@ -1031,7 +1030,7 @@ void readlevelcvars(void)
        g_warmup_allguns = cvar("g_warmup_allguns");\r
        g_warmup_allow_timeout = cvar("g_warmup_allow_timeout");\r
 \r
-       if ((g_race && g_race_qualifying == 2) || g_arena || g_assault || cvar("g_campaign"))\r
+       if ((g_race && g_race_qualifying == 2) || g_arena || g_assault || g_rpg || cvar("g_campaign"))\r
                inWarmupStage = 0; // these modes cannot work together, sorry\r
 \r
        g_pickup_respawntime_weapon = cvar("g_pickup_respawntime_weapon");\r
@@ -1083,7 +1082,7 @@ void readlevelcvars(void)
        if(g_ghost_items >= 1)\r
                g_ghost_items = 0.25; // default alpha value\r
 \r
-       if not(inWarmupStage && !g_ca)\r
+       if not(inWarmupStage && !g_ca && !g_rpg)\r
                game_starttime = cvar("g_start_delay");\r
 \r
        sv_pitch_min = cvar("sv_pitch_min");\r
@@ -1442,9 +1441,6 @@ void precache()
     // common weapon precaches\r
     precache_sound ("weapons/weapon_switch.wav");\r
     precache_sound ("weapons/weaponpickup.wav");\r
-    precache_sound ("weapons/grabber_fire.wav"); // grabber\r
-       precache_sound ("weapons/grabber_altfire.wav"); // grabber\r
-    precache_sound ("weapons/grabber_impact.wav"); // grabber\r
 \r
        float i;\r
        for(i = 0; i < 8; i += 1)\r