X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fmapobjects%2Ftrigger%2Fhurt.qc;h=8c21c509c5643419bb937d1d4170a81d711f12df;hb=c726884106c898a2e1d3f33cf0bf0bb2542fe5e1;hp=966e0cfb0fe6657287ee8135c9f9411f732de18d;hpb=0076d3f631e54b908b7506883c75c6d28f6b9505;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/mapobjects/trigger/hurt.qc b/qcsrc/common/mapobjects/trigger/hurt.qc
index 966e0cfb0..8c21c509c 100644
--- a/qcsrc/common/mapobjects/trigger/hurt.qc
+++ b/qcsrc/common/mapobjects/trigger/hurt.qc
@@ -25,7 +25,7 @@ void trigger_hurt_touch(entity this, entity toucher)
 		if (toucher.triggerhurttime < time)
 		{
 			EXACTTRIGGER_TOUCH(this, toucher);
-			toucher.triggerhurttime = time + 1;
+			toucher.triggerhurttime = time + ((autocvar_sv_q3defragcompat && !(this.spawnflags & HURT_SLOW)) ? 0.1 : 1);
 
 			entity own;
 			own = this.enemy;
@@ -53,7 +53,7 @@ void trigger_hurt_touch(entity this, entity toucher)
 /*QUAKED spawnfunc_trigger_hurt (.5 .5 .5) ?
 Any object touching this will be hurt
 set dmg to damage amount
-default dmg = 1000
+default dmg = 10000
 */
 .entity trigger_hurt_next;
 entity trigger_hurt_last;
@@ -66,7 +66,7 @@ spawnfunc(trigger_hurt)
 	this.use = trigger_hurt_use;
 	this.enemy = world; // I hate you all
 	if (!this.dmg)
-		this.dmg = 1000;
+		this.dmg = ((autocvar_sv_q3defragcompat) ? 5 : 10000);
 	if (this.message == "")
 		this.message = "was in the wrong place";
 	if (this.message2 == "")