No warmup stage or start delay in RPG

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

diff --git a/data/qcsrc/server/miscfunctions.qc b/data/qcsrc/server/miscfunctions.qc
index 561631e5e5f05de4b69c31dbcef86969fd32b000..2f36d6073eb03ecbf85862c12395cb15aba0be5b 100644 (file)
--- a/data/qcsrc/server/miscfunctions.qc
+++ b/data/qcsrc/server/miscfunctions.qc
@@ -616,8 +616,8 @@ void GetCvars(float f)
        GetCvars_handleFloat(s, f, cvar_cl_accuracy_data_receive, "cl_accuracy_data_receive");\r
        GetCvars_handleFloat(s, f, cvar_chase_active, "chase_active");\r
        GetCvars_handleFloat(s, f, cvar_cl_vore_stomachmodel, "cl_vore_stomachmodel");\r
-       GetCvars_handleFloat(s, f, cvar_cl_vore_cameraspeed, "cl_vore_cameraspeed");\r
-       GetCvars_handleFloat(s, f, cvar_cl_vore_punchangle, "cl_vore_punchangle");\r
+       GetCvars_handleFloat(s, f, cvar_cl_vore_swallowmodel, "cl_vore_swallowmodel");\r
+       GetCvars_handleFloat(s, f, cvar_cl_vore_autodigest, "cl_vore_autodigest");\r
 \r
        self.cvar_cl_accuracy_data_share = boolean(self.cvar_cl_accuracy_data_share);\r
        self.cvar_cl_accuracy_data_receive = boolean(self.cvar_cl_accuracy_data_receive);\r
@@ -1017,6 +1017,7 @@ 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
@@ -1030,7 +1031,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
@@ -1082,7 +1083,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
@@ -1332,8 +1333,6 @@ void precache()
 {\r
     // gamemode related things\r
     precache_model ("models/misc/chatbubble.spr");\r
-    precache_model ("models/misc/teambubble.spr");\r
-       precache_model ("models/misc/teambubbleheal.spr");\r
 \r
        // used by the waypoint editor\r
        precache_model ("models/rune.mdl");\r
@@ -1351,6 +1350,7 @@ void precache()
         precache_all_models("models/player/*.dpm");\r
         precache_all_models("models/player/*.md3");\r
         precache_all_models("models/player/*.psk");\r
+               precache_all_models("models/player/*.iqm");\r
         //precache_model("models/player/vixen.zym");\r
     }\r
 \r
@@ -1409,6 +1409,8 @@ void precache()
     precache_sound ("misc/hit.wav");\r
        precache_sound ("misc/typehit.wav");\r
        precache_sound ("misc/unavailable.wav");\r
+       precache_sound ("misc/forbidden.wav");\r
+       precache_sound ("misc/beep.wav");\r
     PrecacheGlobalSound((globalsound_fall = "misc/hitground 4"));\r
     PrecacheGlobalSound((globalsound_metalfall = "misc/metalhitground 4"));\r
     precache_sound ("misc/null.wav");\r
@@ -1419,6 +1421,8 @@ void precache()
     precache_sound ("player/lava.wav");\r
     precache_sound ("player/slime.wav");\r
     precache_sound ("player/digest.wav");\r
+       precache_sound ("misc/health_regen.wav");\r
+       precache_sound ("misc/armor_regen.wav");\r
 \r
     if (g_jetpack)\r
         precache_sound ("misc/jetpack_fly.wav");\r
@@ -1438,10 +1442,10 @@ 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
-       precache_sound ("weapons/stomachkick.ogg");\r
+\r
+       float i;\r
+       for(i = 0; i < 8; i += 1)\r
+               precache_sound (strcat("weapons/hit", ftos(i), ".wav"));\r
 \r
     if (cvar("sv_precacheweapons"))\r
     {\r