From: terencehill <piuntn@gmail.com>
Date: Sat, 16 Sep 2017 13:48:36 +0000 (+0200)
Subject: Remove intialization of .dmg for players as it isn't used anywhere
X-Git-Tag: xonotic-v0.8.5~2471
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=d5427dbf2fc69087e38623359cc67522eede00c3;p=xonotic%2Fxonotic-data.pk3dir.git

Remove intialization of .dmg for players as it isn't used anywhere
---

diff --git a/qcsrc/server/client.qc b/qcsrc/server/client.qc
index 7acd7bb5e..517e0c98f 100644
--- a/qcsrc/server/client.qc
+++ b/qcsrc/server/client.qc
@@ -537,7 +537,6 @@ void PutPlayerInServer(entity this)
 		this.flags |= FL_NOTARGET;
 	this.takedamage = DAMAGE_AIM;
 	this.effects = EF_TELEPORT_BIT | EF_RESTARTANIM_BIT;
-	this.dmg = 2; // WTF
 
 	if (warmup_stage) {
 		this.ammo_shells = warmup_start_ammo_shells;
@@ -2664,7 +2663,6 @@ void DrownPlayer(entity this)
 		if(this.air_finished < time)
 			PlayerSound(this, playersound_gasp, CH_PLAYER, VOL_BASE, VOICETYPE_PLAYERSOUND);
 		this.air_finished = time + autocvar_g_balance_contents_drowndelay;
-		this.dmg = 2;
 	}
 	else if (this.air_finished < time)
 	{	// drown!
diff --git a/qcsrc/server/sv_main.qc b/qcsrc/server/sv_main.qc
index 18706028f..97299ffef 100644
--- a/qcsrc/server/sv_main.qc
+++ b/qcsrc/server/sv_main.qc
@@ -88,7 +88,6 @@ void CreatureFrame_Liquids(entity this)
 			this.dmgtime = 0;
 		}
 		this.air_finished = time + 12;
-		this.dmg = 2;
 	}
 }