Set the weaponmodel every frame again, instead change the tuba's mdl when the user...

diff --git a/qcsrc/client/view.qc b/qcsrc/client/view.qc
index 7f1ef2ce901a4e364c6278cab2cb0daad0c0b9b7..ee2e2c0b506c320ec126cfcf3bb1ff1fff879443 100644 (file)
--- 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 b9c1554b9be09d7ae785e8708ca780cef3fbb217..7ed417428f6151f812c475e6abf6f4347b00e600 100644 (file)
--- 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