r3734 - trunk/data/qcsrc/server

[savagex at icculus.org]

Author: savagex
Date: 2008-06-29 07:19:09 -0400 (Sun, 29 Jun 2008)
New Revision: 3734

Modified:
   trunk/data/qcsrc/server/cl_player.qc
   trunk/data/qcsrc/server/defs.qh
   trunk/data/qcsrc/server/g_damage.qc
   trunk/data/qcsrc/server/g_violence.qc
   trunk/data/qcsrc/server/miscfunctions.qc
Log:
make sv_gentle a global variable, read in the same fashion as sv_cheats. It thus needs a 
server restart to kick into effect, but it saves tons of cvar() calls.


Modified: trunk/data/qcsrc/server/cl_player.qc
===================================================================
--- trunk/data/qcsrc/server/cl_player.qc	2008-06-29 10:50:42 UTC (rev 3733)
+++ trunk/data/qcsrc/server/cl_player.qc	2008-06-29 11:19:09 UTC (rev 3734)
@@ -257,9 +257,8 @@
 
 void PlayerCorpseDamage (entity inflictor, entity attacker, float damage, float deathtype, vector hitloc, vector force)
 {
-	local float take, save, gentle;
-	gentle = cvar("sv_gentle");
-	if(gentle < 1)	
+	local float take, save;
+	if(sv_gentle < 1)	
 		pointparticles(particleeffectnum("blood"), hitloc, force, bound(0, damage, 200));
 	// damage resistance (ignore most of the damage from a bullet or similar)
 	damage = max(damage - 5, 1);
@@ -274,7 +273,7 @@
 	else if (take > 10)
 		sound (self, CHAN_IMPACT, "misc/bodyimpact1.wav", 1, ATTN_NORM);
 
-	if(gentle < 1) {	
+	if(sv_gentle < 1) {	
 		if (take > 50)
 			TossGib (world, "models/gibs/chunk.mdl", hitloc, force * -0.1,1);
 		if (take > 100)
@@ -310,7 +309,7 @@
 		// make a meaty mess
 		TossGib (self, "models/gibs/eye.md3", self.origin + self.view_ofs, self.velocity + randomvec() * 150,0);
 		
-		if(gentle < 1) {
+		if(sv_gentle < 1) {
 			te_bloodshower (self.origin + self.mins, self.origin + self.maxs, 1200 * multiplier, 1000);
 			TossGib (world, "models/gibs/bloodyskull.md3", self.origin + self.view_ofs, self.velocity,0);
 
@@ -357,7 +356,7 @@
 	local float take, save, waves, sdelay;
 
 	damage = damage * bound(1.0, self.cvar_cl_handicap, 100.0);
-	if(cvar("sv_gentle")) {
+	if(sv_gentle > 0) {
 		pointparticles(particleeffectnum("damage_hit"), hitloc, force, bound(0, damage, 200));
 	} else {
 		pointparticles(particleeffectnum("blood"), hitloc, force, bound(0, damage, 200));
@@ -365,7 +364,7 @@
 
 	if (self.pain_finished < time)		//Don't switch pain sequences like crazy
 	{
-		if(!cvar("sv_gentle")) {		
+		if(sv_gentle < 1) {		
 			if (random() > 0.5)
 				player_setanim(self.anim_pain1, FALSE, TRUE, TRUE);
 			else
@@ -561,7 +560,7 @@
 		if(defer_ClientKill_Now_TeamChange)
 			ClientKill_Now_TeamChange();
 
-		if(cvar("sv_gentle")) {
+		if(sv_gentle > 0) {
 			// remove corpse
 			PlayerCorpseDamage (inflictor, attacker, 100.0, deathtype, hitloc, force);
 			pointparticles(particleeffectnum("damage_dissolve"), self.origin, force, 1);

Modified: trunk/data/qcsrc/server/defs.qh
===================================================================
--- trunk/data/qcsrc/server/defs.qh	2008-06-29 10:50:42 UTC (rev 3733)
+++ trunk/data/qcsrc/server/defs.qh	2008-06-29 11:19:09 UTC (rev 3734)
@@ -9,6 +9,7 @@
 float tourneyInMatchStage;
 
 float sv_cheats;
+float sv_gentle;
 float sv_foginterval;
 
 entity	activator;

Modified: trunk/data/qcsrc/server/g_damage.qc
===================================================================
--- trunk/data/qcsrc/server/g_damage.qc	2008-06-29 10:50:42 UTC (rev 3733)
+++ trunk/data/qcsrc/server/g_damage.qc	2008-06-29 11:19:09 UTC (rev 3734)
@@ -224,8 +224,13 @@
 					bprint("^1",a, "^1 drew first blood", "\n");
 				}
 
-				centerprint(attacker, strcat("^4You fragged ^7", s, "\n\n\n"));
-				centerprint(targ, strcat("^1You were fragged by ^7", a, "\n\n\n"));
+				if(sv_gentle > 0) {
+					centerprint(attacker, strcat("^4You scored against ^7", s, "\n\n\n"));
+					centerprint(targ, strcat(a,"^1 scored against you ^7\n\n\n"));
+				} else {
+					centerprint(attacker, strcat("^4You fragged ^7", s, "\n\n\n"));
+					centerprint(targ, strcat("^1You were fragged by ^7", a, "\n\n\n"));
+				}
 
 				if (deathtype == IT_LASER)
 					bprint ("^1",s, "^1 was blasted by ", a, "\n");

Modified: trunk/data/qcsrc/server/g_violence.qc
===================================================================
--- trunk/data/qcsrc/server/g_violence.qc	2008-06-29 10:50:42 UTC (rev 3733)
+++ trunk/data/qcsrc/server/g_violence.qc	2008-06-29 11:19:09 UTC (rev 3734)
@@ -11,7 +11,7 @@
 	else if (r < 0.75)
 		sound (self, CHAN_IMPACT, "misc/gib_splat04.wav", 1, ATTN_NORM);
 	
-	if(cvar("sv_gentle") < 1)
+	if(sv_gentle < 1)
 		pointparticles(particleeffectnum("blood"), self.origin + '0 0 1', '0 0 30', 10);
 	self.health = self.health - damage;
 	if (self.health <= -1000)
@@ -39,7 +39,7 @@
 {
 	if(self.classname == "player") // the eye
 	{
-		if(cvar("sv_gentle")) {
+		if(sv_gentle > 0) {
 			self.model = "";
 			return TRUE;
 		}

Modified: trunk/data/qcsrc/server/miscfunctions.qc
===================================================================
--- trunk/data/qcsrc/server/miscfunctions.qc	2008-06-29 10:50:42 UTC (rev 3733)
+++ trunk/data/qcsrc/server/miscfunctions.qc	2008-06-29 11:19:09 UTC (rev 3734)
@@ -751,6 +751,7 @@
 void readlevelcvars(void)
 {
 	sv_cheats = cvar("sv_cheats");
+	sv_gentle = cvar("sv_gentle");
 	sv_foginterval = cvar("sv_foginterval");
 	g_cloaked = cvar("g_cloaked");
 	g_footsteps = cvar("g_footsteps");