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

diff --git a/data/qcsrc/server/miscfunctions.qc b/data/qcsrc/server/miscfunctions.qc
index 65af9b2c..d8c72f49 100644
--- a/data/qcsrc/server/miscfunctions.qc
+++ b/data/qcsrc/server/miscfunctions.qc
@@ -616,6 +616,8 @@ 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);
 	self.cvar_cl_accuracy_data_receive = boolean(self.cvar_cl_accuracy_data_receive);
@@ -852,7 +854,12 @@ float want_weapon(string cvarprefix, entity weaponinfo, float allguns)
 	var float t = cvar(strcat(cvarprefix, weaponinfo.netname));
 
 	if (t < 0) // "default" weapon selection
-		t = (i == WEP_GRABBER);
+	{
+		if(g_rpg) // no start weapons in RPG by default
+			t = 0;
+		else
+			t = (i == WEP_GRABBER);
+	}
 
 	return t;
 }
@@ -868,7 +875,7 @@ void readplayerstartcvars()
 	start_health = cvar("g_balance_health_start");
 	start_armorvalue = cvar("g_balance_armor_start");
 
-	if (g_lms || g_ca)
+	if (g_lms)
 	{
 		start_ammo_fuel = cvar("g_lms_start_ammo_fuel");
 		start_health = cvar("g_lms_start_health");
@@ -901,23 +908,20 @@ void readplayerstartcvars()
 		warmup_start_armorvalue = start_armorvalue;
 		warmup_start_weapons = start_weapons;
 
-		if (!g_ca)
+		if (cvar("g_use_ammunition"))
 		{
-			if (cvar("g_use_ammunition"))
-			{
-				warmup_start_ammo_fuel = cvar("g_warmup_start_ammo_fuel");
-			}
-			warmup_start_health = cvar("g_warmup_start_health");
-			warmup_start_armorvalue = cvar("g_warmup_start_armor");
-			warmup_start_weapons = 0;
-			for (i = WEP_FIRST; i <= WEP_LAST; ++i)
+			warmup_start_ammo_fuel = cvar("g_warmup_start_ammo_fuel");
+		}
+		warmup_start_health = cvar("g_warmup_start_health");
+		warmup_start_armorvalue = cvar("g_warmup_start_armor");
+		warmup_start_weapons = 0;
+		for (i = WEP_FIRST; i <= WEP_LAST; ++i)
+		{
+			e = get_weaponinfo(i);
+			if(want_weapon("g_start_weapon_", e, cvar("g_warmup_allguns")))
 			{
-				e = get_weaponinfo(i);
-				if(want_weapon("g_start_weapon_", e, cvar("g_warmup_allguns")))
-				{
-					warmup_start_weapons |= e.weapons;
-					weapon_action(e.weapon, WR_PRECACHE);
-				}
+				warmup_start_weapons |= e.weapons;
+				weapon_action(e.weapon, WR_PRECACHE);
 			}
 		}
 	}
@@ -1026,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");
@@ -1078,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");
@@ -1259,8 +1263,11 @@ void stopsound(entity e, float chan)
 void play2(entity e, string filename)
 {
     //stuffcmd(e, strcat("play2 ", filename, "\n"));
-    msg_entity = e;
-    soundtoat(MSG_ONE, world, '0 0 0', CHAN_AUTO, filename, VOL_BASE, ATTN_NONE);
+    if (clienttype(e) == CLIENTTYPE_REAL)
+    {
+        msg_entity = e;
+        soundtoat(MSG_ONE, world, '0 0 0', CHAN_AUTO, filename, VOL_BASE, ATTN_NONE);
+    }
 }
 
 // use this one if you might be causing spam (e.g. from touch functions that might get called more than once per frame)
@@ -1325,7 +1332,6 @@ void precache()
 {
     // gamemode related things
     precache_model ("models/misc/chatbubble.spr");
-    precache_model ("models/misc/teambubble.spr");
 
 	// used by the waypoint editor
 	precache_model ("models/rune.mdl");
@@ -1343,6 +1349,7 @@ void precache()
         precache_all_models("models/player/*.dpm");
         precache_all_models("models/player/*.md3");
         precache_all_models("models/player/*.psk");
+		precache_all_models("models/player/*.iqm");
         //precache_model("models/player/vixen.zym");
     }
 
@@ -1400,6 +1407,9 @@ void precache()
     precache_sound ("misc/gib_splat04.wav");
     precache_sound ("misc/hit.wav");
 	precache_sound ("misc/typehit.wav");
+	precache_sound ("misc/unavailable.wav");
+	precache_sound ("misc/forbidden.wav");
+	precache_sound ("misc/beep.wav");
     PrecacheGlobalSound((globalsound_fall = "misc/hitground 4"));
     PrecacheGlobalSound((globalsound_metalfall = "misc/metalhitground 4"));
     precache_sound ("misc/null.wav");
@@ -1410,6 +1420,8 @@ void precache()
     precache_sound ("player/lava.wav");
     precache_sound ("player/slime.wav");
     precache_sound ("player/digest.wav");
+	precache_sound ("misc/health_regen.wav");
+	precache_sound ("misc/armor_regen.wav");
 
     if (g_jetpack)
         precache_sound ("misc/jetpack_fly.wav");
@@ -1429,10 +1441,10 @@ void precache()
     // common weapon precaches
     precache_sound ("weapons/weapon_switch.wav");
     precache_sound ("weapons/weaponpickup.wav");
-    precache_sound ("weapons/unavailable.wav");
-    precache_sound ("weapons/grabber_fire.wav"); // grabber
-    precache_sound ("weapons/grabber_impact.wav"); // grabber
-	precache_sound ("weapons/stomachkick.ogg");
+
+	float i;
+	for(i = 0; i < 8; i += 1)
+		precache_sound (strcat("weapons/hit", ftos(i), ".wav"));
 
     if (cvar("sv_precacheweapons"))
     {