r2565 - trunk/data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: lordhavoc
Date: 2007-05-15 03:26:59 -0400 (Tue, 15 May 2007)
New Revision: 2565

Modified:
   trunk/data/qcsrc/server/g_violence.qc
   trunk/data/qcsrc/server/sv_main.qc
Log:
gibs are no longer considered creatures, and hence immune to lava damage
and its corresponding sound effects
corpses take damage from lava again


Modified: trunk/data/qcsrc/server/g_violence.qc
===================================================================
--- trunk/data/qcsrc/server/g_violence.qc	2007-05-14 20:47:39 UTC (rev 2564)
+++ trunk/data/qcsrc/server/g_violence.qc	2007-05-15 07:26:59 UTC (rev 2565)
@@ -62,7 +62,7 @@
 	// don't set his classname to something else or it'll screw up a lot of stuff
 	if(gib.classname != "player")
 		gib.classname = "gib";
-	gib.iscreature = TRUE;
+	gib.iscreature = FALSE; // not a creature, because lava sounds on gibs are annoying
 	gib.movetype = MOVETYPE_BOUNCE;
 	gib.solid = SOLID_CORPSE;
 	gib.skin = 0;

Modified: trunk/data/qcsrc/server/sv_main.qc
===================================================================
--- trunk/data/qcsrc/server/sv_main.qc	2007-05-14 20:47:39 UTC (rev 2564)
+++ trunk/data/qcsrc/server/sv_main.qc	2007-05-15 07:26:59 UTC (rev 2565)
@@ -44,9 +44,7 @@
 						if (self.watersound_finished < time)
 						{
 							self.watersound_finished = time + 0.5;
-							if(self.deadflag == DEAD_NO)
-								if(self.classname == "player")
-									sound (self, CHAN_BODY, "player/lava.wav", 1, ATTN_NORM);
+							sound (self, CHAN_BODY, "player/lava.wav", 1, ATTN_NORM);
 						}
 						Damage (self, world, world, 6 * self.waterlevel, DEATH_LAVA, self.origin, '0 0 0');
 					}