From: Mario <mario@smbclan.net>
Date: Thu, 14 Jun 2018 15:53:39 +0000 (+1000)
Subject: Merge branch 'master' into Mario/weapons_fpsfix
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=a92318374023f7d811c2c931b794231275558ea0;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into Mario/weapons_fpsfix

# Conflicts:
#	qcsrc/server/weapons/weaponsystem.qc
---

a92318374023f7d811c2c931b794231275558ea0
diff --cc qcsrc/common/mutators/mutator/overkill/okhmg.qc
index d278ca9d4,d278ca9d4..0aac4b59c
--- a/qcsrc/common/mutators/mutator/overkill/okhmg.qc
+++ b/qcsrc/common/mutators/mutator/overkill/okhmg.qc
@@@ -75,14 -75,14 +75,11 @@@ METHOD(OverkillHeavyMachineGun, wr_thin
  			(actor.(weaponentity).wframe == WFRAME_FIRE2))
  		{
  			// Set secondary fire animation.
--			vector a = '0 0 0';
  			actor.(weaponentity).wframe = WFRAME_FIRE2;
--			a = actor.(weaponentity).anim_fire2;
--			a.z *= g_weaponratefactor;
  			FOREACH_CLIENT(true, LAMBDA(
  				if (it == actor || (IS_SPEC(it) && it.enemy == actor))
  				{
--					wframe_send(it, actor.(weaponentity), a, true);
++					wframe_send(it, actor.(weaponentity), WFRAME_FIRE2, true);
  				}
  			));
  			animdecide_setaction(actor, ANIMACTION_SHOOT, true);
diff --cc qcsrc/common/mutators/mutator/overkill/okmachinegun.qc
index 63c1e245b,63c1e245b..ad290ec99
--- a/qcsrc/common/mutators/mutator/overkill/okmachinegun.qc
+++ b/qcsrc/common/mutators/mutator/overkill/okmachinegun.qc
@@@ -69,14 -69,14 +69,11 @@@ METHOD(OverkillMachineGun, wr_think, vo
  			(actor.(weaponentity).wframe == WFRAME_FIRE2))
  		{
  			// Set secondary fire animation.
--			vector a = '0 0 0';
  			actor.(weaponentity).wframe = WFRAME_FIRE2;
--			a = actor.(weaponentity).anim_fire2;
--			a.z *= g_weaponratefactor;
  			FOREACH_CLIENT(true, LAMBDA(
  				if (it == actor || (IS_SPEC(it) && it.enemy == actor))
  				{
--					wframe_send(it, actor.(weaponentity), a, true);
++					wframe_send(it, actor.(weaponentity), WFRAME_FIRE2, true);
  				}
  			));
  			animdecide_setaction(actor, ANIMACTION_SHOOT, true);
diff --cc qcsrc/common/mutators/mutator/overkill/oknex.qc
index 0f67ddba2,0f67ddba2..f97455cde
--- a/qcsrc/common/mutators/mutator/overkill/oknex.qc
+++ b/qcsrc/common/mutators/mutator/overkill/oknex.qc
@@@ -145,14 -145,14 +145,11 @@@ METHOD(OverkillNex, wr_think, void(enti
  			(actor.(weaponentity).wframe == WFRAME_FIRE2))
  		{
  			// Set secondary fire animation.
--			vector a = '0 0 0';
  			actor.(weaponentity).wframe = WFRAME_FIRE2;
--			a = actor.(weaponentity).anim_fire2;
--			a.z *= g_weaponratefactor;
  			FOREACH_CLIENT(true, LAMBDA(
  				if (it == actor || (IS_SPEC(it) && it.enemy == actor))
  				{
--					wframe_send(it, actor.(weaponentity), a, true);
++					wframe_send(it, actor.(weaponentity), WFRAME_FIRE2, true);
  				}
  			));
  			animdecide_setaction(actor, ANIMACTION_SHOOT, true);
diff --cc qcsrc/common/mutators/mutator/overkill/okrpc.qc
index c06ca5b78,c06ca5b78..b996869ce
--- a/qcsrc/common/mutators/mutator/overkill/okrpc.qc
+++ b/qcsrc/common/mutators/mutator/overkill/okrpc.qc
@@@ -126,14 -126,14 +126,11 @@@ METHOD(OverkillRocketPropelledChainsaw
  			(actor.(weaponentity).wframe == WFRAME_FIRE2))
  		{
  			// Set secondary fire animation.
--			vector a = '0 0 0';
  			actor.(weaponentity).wframe = WFRAME_FIRE2;
--			a = actor.(weaponentity).anim_fire2;
--			a.z *= g_weaponratefactor;
  			FOREACH_CLIENT(true, LAMBDA(
  				if (it == actor || (IS_SPEC(it) && it.enemy == actor))
  				{
--					wframe_send(it, actor.(weaponentity), a, true);
++					wframe_send(it, actor.(weaponentity), WFRAME_FIRE2, true);
  				}
  			));
  			animdecide_setaction(actor, ANIMACTION_SHOOT, true);
diff --cc qcsrc/common/mutators/mutator/overkill/okshotgun.qc
index 2f1651776,2f1651776..27d95828e
--- a/qcsrc/common/mutators/mutator/overkill/okshotgun.qc
+++ b/qcsrc/common/mutators/mutator/overkill/okshotgun.qc
@@@ -24,14 -24,14 +24,11 @@@ METHOD(OverkillShotgun, wr_think, void(
  			(actor.(weaponentity).wframe == WFRAME_FIRE2))
  		{
  			// Set secondary fire animation.
--			vector a = '0 0 0';
  			actor.(weaponentity).wframe = WFRAME_FIRE2;
--			a = actor.(weaponentity).anim_fire2;
--			a.z *= g_weaponratefactor;
  			FOREACH_CLIENT(true, LAMBDA(
  				if (it == actor || (IS_SPEC(it) && it.enemy == actor))
  				{
--					wframe_send(it, actor.(weaponentity), a, true);
++					wframe_send(it, actor.(weaponentity), WFRAME_FIRE2, true);
  				}
  			));
  			animdecide_setaction(actor, ANIMACTION_SHOOT, true);
diff --cc qcsrc/common/weapons/all.qh
index 2a151d1af,9b4c0b468..2aec2057f
--- a/qcsrc/common/weapons/all.qh
+++ b/qcsrc/common/weapons/all.qh
@@@ -367,4 -367,8 +367,8 @@@ ENUMCLASS_END(WFRAME
  
  vector shotorg_adjust_values(vector vecs, bool y_is_right, bool visual, int algn);
  void CL_WeaponEntity_SetModel(entity this, string name, bool _anim);
+ 
+ #ifdef SVQC
 -void wframe_send(entity actor, entity weaponentity, vector a, bool restartanim);
++void wframe_send(entity actor, entity weaponentity, int a, bool restartanim);
+ #endif
  #endif