Revert hiding of the weapon entity until a clean solution can be applied

diff --git a/qcsrc/common/mutators/mutator/nades/nades.qc b/qcsrc/common/mutators/mutator/nades/nades.qc
index 2da326ac8ad9be4b585b68ec93b7929dcf0e0d01..b4a3066fb04a17621faa46e165db9160320e9308 100644 (file)
--- a/qcsrc/common/mutators/mutator/nades/nades.qc
+++ b/qcsrc/common/mutators/mutator/nades/nades.qc
@@ -975,10 +975,6 @@ void toss_nade(entity e, bool set_owner, vector _velocity, float _time)
        if(set_owner)
                _nade.realowner = e;
 
-       .entity weaponentity = _nade.weaponentity_fld;
-       if(e.(weaponentity))
-               e.(weaponentity).nodrawtoclient = e; // restore it!
-
        settouch(_nade, nade_touch);
        _nade.spawnshieldtime = time + 0.1; // prevent instantly picking up again
        SetResourceAmount(_nade, RESOURCE_HEALTH, autocvar_g_nades_nade_health);
@@ -1108,8 +1104,6 @@ void spawn_held_nade(entity player, entity nowner, float ntime, int ntype, strin
 
        setmodel(fn, MDL_NADE_VIEW);
        setattachment(fn, player.(weaponentity), "");
-       if(player.(weaponentity))
-               player.(weaponentity).nodrawtoclient = NULL; // temporarily allow server side view model
        fn.realowner = fn.owner = player;
        fn.colormod = Nades_from(STAT(NADE_BONUS_TYPE, n)).m_color;
        fn.colormap = player.colormap;

diff --git a/qcsrc/server/weapons/weaponsystem.qc b/qcsrc/server/weapons/weaponsystem.qc
index 50a30fed8938e7c6530227389dc07a9ca6a833d5..86988b6e084a7e3e74d9c0a52ad6457f4f3e776c 100644 (file)
--- a/qcsrc/server/weapons/weaponsystem.qc
+++ b/qcsrc/server/weapons/weaponsystem.qc
@@ -179,7 +179,6 @@ void CL_SpawnWeaponentity(entity actor, .entity weaponentity)
        setthink(view, CL_Weaponentity_Think);
        view.nextthink = time;
        view.viewmodelforclient = actor;
-       view.nodrawtoclient = actor;
        view.draggable = drag_undraggable;
        setcefc(view, CL_Weaponentity_CustomizeEntityForClient);