From: Lyberta <lyberta@lyberta.net>
Date: Fri, 28 Apr 2017 18:47:00 +0000 (+0300)
Subject: Merge branch 'master' into Lyberta/StandaloneOverkillWeapons
X-Git-Tag: xonotic-v0.8.5~2119^2~70
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=0d3433983a92ad80893fd18781e01a99857e94c1;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into Lyberta/StandaloneOverkillWeapons
---

0d3433983a92ad80893fd18781e01a99857e94c1
diff --cc qcsrc/server/client.qc
index 2e2e92cd5,72ee5a7cd..284d133cf
--- a/qcsrc/server/client.qc
+++ b/qcsrc/server/client.qc
@@@ -1696,10 -1695,9 +1697,11 @@@ 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;