From 8c2002743bbc47e12d603d849602e3a40d21cc89 Mon Sep 17 00:00:00 2001 From: Freddy Date: Wed, 17 Aug 2016 17:17:31 +0200 Subject: [PATCH] Set the weaponmodel every frame again, instead change the tuba's mdl when the user switches instrument --- qcsrc/client/view.qc | 2 +- qcsrc/common/weapons/weapon/tuba.qc | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/qcsrc/client/view.qc b/qcsrc/client/view.qc index 7f1ef2ce9..ee2e2c0b5 100644 --- a/qcsrc/client/view.qc +++ b/qcsrc/client/view.qc @@ -312,7 +312,7 @@ void viewmodel_draw(entity this) static string name_last; string name = wep.mdl; bool swap = name != name_last; - if (swap) +// if (swap) { name_last = name; CL_WeaponEntity_SetModel(this, name, swap); diff --git a/qcsrc/common/weapons/weapon/tuba.qc b/qcsrc/common/weapons/weapon/tuba.qc index b9c1554b9..7ed417428 100644 --- a/qcsrc/common/weapons/weapon/tuba.qc +++ b/qcsrc/common/weapons/weapon/tuba.qc @@ -398,7 +398,7 @@ METHOD(Tuba, wr_think, void(Tuba this, entity actor, .entity weaponentity, int f METHOD(Tuba, wr_setup, void(Tuba this, entity actor)) { actor.ammo_field = ammo_none; - actor.tuba_instrument = 0; +// actor.tuba_instrument = 0; } #endif @@ -411,6 +411,7 @@ NET_HANDLE(tuba_instrument, bool) string s = (i == 0) ? "tuba" : (i == 1) ? "akordeon" : "kleinbottle" ; + activeweapon.mdl = s; CL_WeaponEntity_SetModel(viewmodel, s, true); } #endif -- 2.39.2