Fix current custom gametype not being kept if gametype vote ends without votes

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / hook.qc

diff --git a/qcsrc/server/hook.qc b/qcsrc/server/hook.qc
index 5bc00c1506a4e202fe4891d12e1aeac021c34fc1..e734addfaae91615d0dd6e53d6ad17199eacb16d 100644 (file)
--- a/qcsrc/server/hook.qc
+++ b/qcsrc/server/hook.qc
@@ -370,7 +370,7 @@ void FireGrapplingHook(entity actor, .entity weaponentity)
        vector vs = hook_shotorigin[s];
        vector oldmovedir = actor.(weaponentity).movedir;
        actor.(weaponentity).movedir = vs;
-       W_SetupShot_ProjectileSize(actor, weaponentity, HOOK_MINS, HOOK_MAXS, true, 0, SND_HOOK_FIRE, CH_WEAPON_B, 0, WEP_HOOK.m_id);
+       W_SetupShot_ProjectileSize(actor, weaponentity, '-3 -3 -3', '3 3 3', true, 0, SND_HOOK_FIRE, CH_WEAPON_B, 0, WEP_HOOK.m_id);
        W_MuzzleFlash(WEP_HOOK, actor, weaponentity, w_shotorg, '0 0 0');
        actor.(weaponentity).movedir = oldmovedir;
 
@@ -388,7 +388,7 @@ void FireGrapplingHook(entity actor, .entity weaponentity)
        PROJECTILE_MAKETRIGGER(missile);
 
        //setmodel (missile, MDL_HOOK); // precision set below
-       setsize (missile, HOOK_MINS, HOOK_MAXS);
+       setsize (missile, '-3 -3 -3', '3 3 3');
        setorigin(missile, w_shotorg);
 
        missile.state = 0; // not latched onto anything
@@ -431,9 +431,10 @@ PRECACHE(GrappleHookInit)
        {
                Weapon w = WEP_HOOK;
                w.wr_init(w);
-               hook_shotorigin[0] = shotorg_adjust_values(CL_Weapon_GetShotOrg(WEP_HOOK.m_id), false, false, 1);
-               hook_shotorigin[1] = shotorg_adjust_values(CL_Weapon_GetShotOrg(WEP_HOOK.m_id), false, false, 2);
-               hook_shotorigin[2] = shotorg_adjust_values(CL_Weapon_GetShotOrg(WEP_HOOK.m_id), false, false, 3);
-               hook_shotorigin[3] = shotorg_adjust_values(CL_Weapon_GetShotOrg(WEP_HOOK.m_id), false, false, 4);
+               vector vecs = CL_Weapon_GetShotOrg(WEP_HOOK.m_id);
+               hook_shotorigin[0] = shotorg_adjust(vecs, false, false, 1);
+               hook_shotorigin[1] = shotorg_adjust(vecs, false, false, 2);
+               hook_shotorigin[2] = shotorg_adjust(vecs, false, false, 3);
+               hook_shotorigin[3] = shotorg_adjust(vecs, false, false, 4);
        }
 }