From: Mario <mario@smbclan.net>
Date: Tue, 29 Nov 2016 14:03:52 +0000 (+1000)
Subject: Merge branch 'master' into Mario/wepent_experimental
X-Git-Tag: xonotic-v0.8.2~326^2~30
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=fde04a29ed6f249c904737ae21ff44f400f1f453;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into Mario/wepent_experimental

# Conflicts:
#	qcsrc/common/mutators/mutator/nades/nades.qc
---

fde04a29ed6f249c904737ae21ff44f400f1f453
diff --cc qcsrc/common/mutators/mutator/nades/nades.qc
index 24d8c87cc,c09e221e4..7f2bed697
--- a/qcsrc/common/mutators/mutator/nades/nades.qc
+++ b/qcsrc/common/mutators/mutator/nades/nades.qc
@@@ -1050,9 -1050,10 +1052,10 @@@ void spawn_held_nade(entity player, ent
  	setthink(n, nade_beep);
  	n.nextthink = max(n.wait - 3, time);
  	n.projectiledeathtype = DEATH_NADE.m_id;
 +	n.weaponentity_fld = weaponentity;
+ 	n.nade_lifetime = ntime;
  
  	setmodel(fn, MDL_NADE_VIEW);
 -	.entity weaponentity = weaponentities[0]; // TODO: unhardcode
  	setattachment(fn, player.(weaponentity), "");
  	fn.realowner = fn.owner = player;
  	fn.colormod = Nades_from(n.nade_type).m_color;
diff --cc qcsrc/server/client.qc
index 58e512a38,04c35a117..2b480e39e
--- a/qcsrc/server/client.qc
+++ b/qcsrc/server/client.qc
@@@ -331,8 -336,10 +331,9 @@@ void PutObserverInServer(entity this
  	this.istypefrag = 0;
  	setthink(this, func_null);
  	this.nextthink = 0;
 -	this.hook_time = 0;
  	this.deadflag = DEAD_NO;
  	this.crouch = false;
+ 	this.revive_progress = 0;
  	this.revival_time = 0;
  
  	this.items = 0;