From: terencehill <piuntn@gmail.com>
Date: Thu, 8 Apr 2021 12:52:52 +0000 (+0200)
Subject: Fix #2475 "Tuba smoke comes out of the ground"
X-Git-Tag: xonotic-v0.8.5~460
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=f538b1c7986940b689d094dcfd6aab85f17ec99b;p=xonotic%2Fxonotic-data.pk3dir.git

Fix #2475 "Tuba smoke comes out of the ground"
---

diff --git a/qcsrc/common/weapons/weapon/tuba.qc b/qcsrc/common/weapons/weapon/tuba.qc
index d27351641..687ada154 100644
--- a/qcsrc/common/weapons/weapon/tuba.qc
+++ b/qcsrc/common/weapons/weapon/tuba.qc
@@ -304,8 +304,9 @@ void W_Tuba_NoteOn(entity actor, .entity weaponentity, float hittype)
 
 	if(time > actor.(weaponentity).tuba_smoketime)
 	{
-		vector o = gettaginfo(actor.exteriorweaponentity, 0);
-		Send_Effect(EFFECT_SMOKE_RING, o + v_up * 45 + v_right * -6 + v_forward * 8, v_up * 100, 1);
+		// FIXME gettaginfo(actor.(weaponentity), 0) doesn't return the real origin of the weapon
+		vector org = gettaginfo(actor.(weaponentity), 0);
+		Send_Effect(EFFECT_SMOKE_RING, org + v_up * 45 + v_right * 10 + v_forward * 14, v_up * 100, 1);
 		actor.(weaponentity).tuba_smoketime = time + 0.25;
 	}
 }