From: Lyberta <lyberta@lyberta.net>
Date: Fri, 4 Aug 2017 22:17:37 +0000 (+0300)
Subject: Merged master.
X-Git-Tag: xonotic-v0.8.5~2119^2~63
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=67410278136b3bf6c5437027ab2f39d0da49753c

Merged master.
---

67410278136b3bf6c5437027ab2f39d0da49753c
diff --cc qcsrc/common/mutators/mutator/overkill/rpc.qc
index afca9517cf,e9a5ce2c3f..536435d34f
--- a/qcsrc/common/mutators/mutator/overkill/rpc.qc
+++ b/qcsrc/common/mutators/mutator/overkill/rpc.qc
@@@ -8,9 -8,9 +8,9 @@@ void W_RocketPropelledChainsaw_Explode(
  	this.event_damage = func_null;
  	this.takedamage = DAMAGE_NO;
  
 -	RadiusDamage (this, this.realowner, WEP_CVAR(rpc, damage), WEP_CVAR(rpc, edgedamage), WEP_CVAR(rpc, radius), NULL, NULL, WEP_CVAR(rpc, force), this.projectiledeathtype, directhitentity);
 +	RadiusDamage (this, this.realowner, WEP_CVAR_PRI(rpc, damage), WEP_CVAR_PRI(rpc, edgedamage), WEP_CVAR_PRI(rpc, radius), NULL, NULL, WEP_CVAR_PRI(rpc, force), this.projectiledeathtype, directhitentity);
  
- 	delete (this);
+ 	delete(this);
  }
  
  void W_RocketPropelledChainsaw_Explode_think(entity this)
diff --cc qcsrc/server/client.qc
index 7401c2cd1a,804868fa00..d8a8c3c52e
--- a/qcsrc/server/client.qc
+++ b/qcsrc/server/client.qc
@@@ -1705,11 -1722,8 +1724,10 @@@ void SpectateCopy(entity this, entity s
  	this.superweapons_finished = spectatee.superweapons_finished;
  	STAT(PRESSED_KEYS, this) = STAT(PRESSED_KEYS, spectatee);
  	this.weapons = spectatee.weapons;
- 	this.dual_weapons = spectatee.dual_weapons;
  	this.vortex_charge = spectatee.vortex_charge;
  	this.vortex_chargepool_ammo = spectatee.vortex_chargepool_ammo;
 +	this.okvortex_charge = spectatee.okvortex_charge;
 +	this.okvortex_chargepool_ammo = spectatee.okvortex_chargepool_ammo;
  	this.hagar_load = spectatee.hagar_load;
  	this.arc_heat_percent = spectatee.arc_heat_percent;
  	this.minelayer_mines = spectatee.minelayer_mines;