Add weaponthrowable property to weapons

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / weapons / w_shotgun.qc

diff --git a/qcsrc/common/weapons/w_shotgun.qc b/qcsrc/common/weapons/w_shotgun.qc
index 2983f4db37f496b09cdd1df12f2843c13f4e04ec..87aa92aafe2388528439eb608c1c5ed9749f82d7 100644 (file)
--- a/qcsrc/common/weapons/w_shotgun.qc
+++ b/qcsrc/common/weapons/w_shotgun.qc
@@ -41,13 +41,15 @@ REGISTER_WEAPON(
        w_prop(id, sn, float,  switchdelay_drop, switchdelay_drop) \
        w_prop(id, sn, string, weaponreplace, weaponreplace) \
        w_prop(id, sn, float,  weaponstart, weaponstart) \
-       w_prop(id, sn, float,  weaponstartoverride, weaponstartoverride)
+       w_prop(id, sn, float,  weaponstartoverride, weaponstartoverride) \
+       w_prop(id, sn, float,  weaponthrowable, weaponthrowable)
 
 #ifdef SVQC
 SHOTGUN_SETTINGS(WEP_ADD_CVAR, WEP_ADD_PROP)
 #endif
 #else
 #ifdef SVQC
+void spawnfunc_weapon_shotgun(void) { weapon_defaultspawnfunc(WEP_SHOTGUN); }
 
 void W_Shotgun_Attack (void)
 {
@@ -187,8 +189,6 @@ void W_Shotgun_Attack2 (void)
        W_SetupShot_Range(self, TRUE, 0, "", 0, WEP_CVAR_SEC(shotgun, damage), WEP_CVAR_SEC(shotgun, melee_range));
 }
 
-void spawnfunc_weapon_shotgun(); // defined in t_items.qc
-
 .float shotgun_primarytime;
 
 float W_Shotgun(float req)
@@ -283,8 +283,7 @@ float W_Shotgun(float req)
                                return WEAPON_SHOTGUN_MURDER;
                }
        }
-
-       return TRUE;
+       return FALSE;
 }
 #endif
 #ifdef CSQC
@@ -324,7 +323,7 @@ float W_Shotgun(float req)
                        return FALSE;
                }
        }
-       return TRUE;
+       return FALSE;
 }
 #endif
 #endif