Optimize Arc and Hook initialization. Also get rid of the useless shotorg_adjust...

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / weapons / weaponsystem.qh

diff --git a/qcsrc/server/weapons/weaponsystem.qh b/qcsrc/server/weapons/weaponsystem.qh
index c0e0c221fff9124a3a5bc81a4f6c66a9e184c760..b09d91010ddfcf572f82672b053e31df3816745b 100644 (file)
--- a/qcsrc/server/weapons/weaponsystem.qh
+++ b/qcsrc/server/weapons/weaponsystem.qh
@@ -47,7 +47,7 @@ void w_clear(Weapon thiswep, entity actor, .entity weaponentity, int fire);
 
 void w_ready(Weapon thiswep, entity actor, .entity weaponentity, int fire);
 
-vector CL_Weapon_GetShotOrg(float wpn);
+vector CL_Weapon_GetShotOrg(int wpn);
 
 bool weaponUseForbidden(entity player);
 bool weaponLocked(entity player);
@@ -56,7 +56,7 @@ void W_AttachToShotorg(entity actor, .entity weaponentity, entity flash, vector
 
 void W_DecreaseAmmo(Weapon wep, entity actor, float ammo_use, .entity weaponentity);
 
-void W_DropEvent(.void(Weapon, entity actor, .entity) event, entity player, float weapon_type, entity weapon_item, .entity weaponentity);
+void W_DropEvent(.void(Weapon, entity actor, .entity) event, entity player, int weapon_type, entity weapon_item, .entity weaponentity);
 
 void W_Reload(entity actor, .entity weaponentity, float sent_ammo_min, Sound sent_sound);
 
@@ -70,9 +70,9 @@ float W_WeaponSpeedFactor(entity this);
 
 bool weapon_prepareattack(Weapon thiswep, entity actor, .entity weaponentity, bool secondary, float attacktime);
 
-bool weapon_prepareattack_check(Weapon thiswep, entity actor, .entity weaponentity, float secondary, float attacktime);
+bool weapon_prepareattack_check(Weapon thiswep, entity actor, .entity weaponentity, bool secondary, float attacktime);
 
-void weapon_prepareattack_do(entity actor, .entity weaponentity, float secondary, float attacktime);
+void weapon_prepareattack_do(entity actor, .entity weaponentity, bool secondary, float attacktime);
 
 void weapon_thinkf(entity actor, .entity weaponentity, WFRAME fr, float t, void(Weapon thiswep, entity actor, .entity weaponentity, int fire) func);