Merge branch 'master' into Lyberta/KillSound

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

diff --git a/qcsrc/server/weapons/throwing.qc b/qcsrc/server/weapons/throwing.qc
index f3a72412bb1955abad7f2f7537c3dc021bfccccd..4b7d45b964157127f682e1de6048aa1bc3c358cd 100644 (file)
--- a/qcsrc/server/weapons/throwing.qc
+++ b/qcsrc/server/weapons/throwing.qc
@@ -11,6 +11,7 @@
 #include <common/util.qh>
 #include <common/weapons/_all.qh>
 #include <common/state.qh>
+#include <common/wepent.qh>
 
 void thrown_wep_think(entity this)
 {
@@ -46,8 +47,9 @@ string W_ThrowNewWeapon(entity own, float wpn, float doreduce, vector org, vecto
        wep.flags |= FL_TOSSED;
        wep.colormap = own.colormap;
        wep.glowmod = weaponentity_glowmod(info, own, own.clientcolors, own.(weaponentity));
+       navigation_dynamicgoal_init(wep, false);
 
-       W_DropEvent(wr_drop,own,wpn,wep);
+       W_DropEvent(wr_drop,own,wpn,wep,weaponentity);
 
        if(WepSet_FromWeapon(Weapons_from(wpn)) & WEPSET_SUPERWEAPONS)
        {
@@ -58,10 +60,10 @@ string W_ThrowNewWeapon(entity own, float wpn, float doreduce, vector org, vecto
                else
                {
                        int superweapons = 1;
-                       FOREACH(Weapons, it != WEP_Null, LAMBDA(
+                       FOREACH(Weapons, it != WEP_Null, {
                                WepSet set = it.m_wepset;
                                if((set & WEPSET_SUPERWEAPONS) && (own.weapons & set)) ++superweapons;
-                       ));
+                       });
                        if(superweapons <= 1)
                        {
                                wep.superweapons_finished = own.superweapons_finished;
@@ -98,10 +100,10 @@ string W_ThrowNewWeapon(entity own, float wpn, float doreduce, vector org, vecto
                {
                        // if our weapon is loaded, give its load back to the player
                        int i = own.(weaponentity).m_weapon.m_id;
-                       if(own.(weapon_load[i]) > 0)
+                       if(own.(weaponentity).(weapon_load[i]) > 0)
                        {
-                               own.(ammotype) += own.(weapon_load[i]);
-                               own.(weapon_load[i]) = -1; // schedule the weapon for reloading
+                               own.(ammotype) += own.(weaponentity).(weapon_load[i]);
+                               own.(weaponentity).(weapon_load[i]) = -1; // schedule the weapon for reloading
                        }
 
                        wep.(ammotype) = 0;
@@ -110,10 +112,10 @@ string W_ThrowNewWeapon(entity own, float wpn, float doreduce, vector org, vecto
                {
                        // if our weapon is loaded, give its load back to the player
                        int i = own.(weaponentity).m_weapon.m_id;
-                       if(own.(weapon_load[i]) > 0)
+                       if(own.(weaponentity).(weapon_load[i]) > 0)
                        {
-                               own.(ammotype) += own.(weapon_load[i]);
-                               own.(weapon_load[i]) = -1; // schedule the weapon for reloading
+                               own.(ammotype) += own.(weaponentity).(weapon_load[i]);
+                               own.(weaponentity).(weapon_load[i]) = -1; // schedule the weapon for reloading
                        }
 
                        thisammo = min(own.(ammotype), wep.(ammotype));
@@ -138,14 +140,12 @@ string W_ThrowNewWeapon(entity own, float wpn, float doreduce, vector org, vecto
 
 bool W_IsWeaponThrowable(entity this, int w)
 {
-       if (MUTATOR_CALLHOOK(ForbidDropCurrentWeapon, this))
+       if (MUTATOR_CALLHOOK(ForbidDropCurrentWeapon, this, w))
                return false;
        if (!autocvar_g_pickup_items)
                return false;
        if (g_weaponarena)
                return 0;
-       if (g_cts)
-               return 0;
     if(w == WEP_Null.m_id)
         return false;
 
@@ -170,7 +170,7 @@ void W_ThrowWeapon(entity this, .entity weaponentity, vector velo, vector delta,
        Weapon w = this.(weaponentity).m_weapon;
        if (w == WEP_Null)
                return; // just in case
-       if(MUTATOR_CALLHOOK(ForbidThrowCurrentWeapon, this))
+       if(MUTATOR_CALLHOOK(ForbidThrowCurrentWeapon, this, this.(weaponentity)))
                return;
        if(!autocvar_g_weapon_throwable)
                return;
@@ -183,16 +183,18 @@ void W_ThrowWeapon(entity this, .entity weaponentity, vector velo, vector delta,
        if(!(this.weapons & set)) return;
        this.weapons &= ~set;
 
-       W_SwitchWeapon_Force(this, w_getbestweapon(this), weaponentity);
+       W_SwitchWeapon_Force(this, w_getbestweapon(this, weaponentity), weaponentity);
        string a = W_ThrowNewWeapon(this, w.m_id, doreduce, this.origin + delta, velo, weaponentity);
 
        if(!a) return;
        Send_Notification(NOTIF_ONE, this, MSG_MULTI, ITEM_WEAPON_DROP, a, w.m_id);
 }
 
-void SpawnThrownWeapon(entity this, vector org, float w, .entity weaponentity)
+void SpawnThrownWeapon(entity this, vector org, Weapon wep, .entity weaponentity)
 {
-       if(this.weapons & WepSet_FromWeapon(this.(weaponentity).m_weapon))
-               if(W_IsWeaponThrowable(this, this.(weaponentity).m_weapon.m_id))
-                       W_ThrowNewWeapon(this, this.(weaponentity).m_weapon.m_id, false, org, randomvec() * 125 + '0 0 200', weaponentity);
+       //entity wep = this.(weaponentity).m_weapon;
+
+       if(this.weapons & WepSet_FromWeapon(wep))
+               if(W_IsWeaponThrowable(this, wep.m_id))
+                       W_ThrowNewWeapon(this, wep.m_id, false, org, randomvec() * 125 + '0 0 200', weaponentity);
 }