X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=data%2Fqcsrc%2Fserver%2Fmiscfunctions.qc;h=d8c72f49cb03da9f54469147ba68ac5063bbcca4;hb=cd0ac8cefda12d4a5d5808dca19af9ed3922c11e;hp=3a053c192f4d86984426745807d76f0c837af5eb;hpb=e79a9bac1c149bc0f0488f33508007586a8cb9af;p=voretournament%2Fvoretournament.git

diff --git a/data/qcsrc/server/miscfunctions.qc b/data/qcsrc/server/miscfunctions.qc
index 3a053c19..d8c72f49 100644
--- a/data/qcsrc/server/miscfunctions.qc
+++ b/data/qcsrc/server/miscfunctions.qc
@@ -616,6 +616,7 @@ void GetCvars(float f)
 	GetCvars_handleFloat(s, f, cvar_cl_accuracy_data_receive, "cl_accuracy_data_receive");
 	GetCvars_handleFloat(s, f, cvar_chase_active, "chase_active");
 	GetCvars_handleFloat(s, f, cvar_cl_vore_stomachmodel, "cl_vore_stomachmodel");
+	GetCvars_handleFloat(s, f, cvar_cl_vore_swallowmodel, "cl_vore_swallowmodel");
 	GetCvars_handleFloat(s, f, cvar_cl_vore_autodigest, "cl_vore_autodigest");
 
 	self.cvar_cl_accuracy_data_share = boolean(self.cvar_cl_accuracy_data_share);
@@ -1016,7 +1017,6 @@ void readlevelcvars(void)
 	g_norecoil = cvar("g_norecoil");
 	g_vampire = cvar("g_vampire");
 	g_bloodloss = cvar("g_bloodloss");
-	g_balance_vore_swallow_limit = bound(1, cvar("g_balance_vore_swallow_limit"), 9); // may only range between 1 and 9
 	sv_maxidle = cvar("sv_maxidle");
 	sv_maxidle_spectatorsareidle = cvar("sv_maxidle_spectatorsareidle");
 	sv_pogostick = cvar("sv_pogostick");
@@ -1030,7 +1030,7 @@ void readlevelcvars(void)
 	g_warmup_allguns = cvar("g_warmup_allguns");
 	g_warmup_allow_timeout = cvar("g_warmup_allow_timeout");
 
-	if ((g_race && g_race_qualifying == 2) || g_arena || g_assault || cvar("g_campaign"))
+	if ((g_race && g_race_qualifying == 2) || g_arena || g_assault || g_rpg || cvar("g_campaign"))
 		inWarmupStage = 0; // these modes cannot work together, sorry
 
 	g_pickup_respawntime_weapon = cvar("g_pickup_respawntime_weapon");
@@ -1082,7 +1082,7 @@ void readlevelcvars(void)
 	if(g_ghost_items >= 1)
 		g_ghost_items = 0.25; // default alpha value
 
-	if not(inWarmupStage && !g_ca)
+	if not(inWarmupStage && !g_ca && !g_rpg)
 		game_starttime = cvar("g_start_delay");
 
 	sv_pitch_min = cvar("sv_pitch_min");
@@ -1332,8 +1332,6 @@ void precache()
 {
     // gamemode related things
     precache_model ("models/misc/chatbubble.spr");
-    precache_model ("models/misc/teambubble.spr");
-	precache_model ("models/misc/teambubbleheal.spr");
 
 	// used by the waypoint editor
 	precache_model ("models/rune.mdl");
@@ -1443,10 +1441,10 @@ void precache()
     // common weapon precaches
     precache_sound ("weapons/weapon_switch.wav");
     precache_sound ("weapons/weaponpickup.wav");
-    precache_sound ("weapons/grabber_fire.wav"); // grabber
-	precache_sound ("weapons/grabber_altfire.wav"); // grabber
-    precache_sound ("weapons/grabber_impact.wav"); // grabber
-	precache_sound ("weapons/stomachkick.wav");
+
+	float i;
+	for(i = 0; i < 8; i += 1)
+		precache_sound (strcat("weapons/hit", ftos(i), ".wav"));
 
     if (cvar("sv_precacheweapons"))
     {