X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fweapons%2Fweaponsystem.qh;h=4ddf5a5159eac5adf534d6c61cafd0dc8a933445;hb=e57fd111a3279a4aa4789e2c72f9c819a56c7be9;hp=7c7459df2c5e0b9f18600f2c371d6880fe7b93b5;hpb=1245fb3e998e9ace1b301dbe4bfb84b55f25bdf4;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/weapons/weaponsystem.qh b/qcsrc/server/weapons/weaponsystem.qh
index 7c7459df2..4ddf5a515 100644
--- a/qcsrc/server/weapons/weaponsystem.qh
+++ b/qcsrc/server/weapons/weaponsystem.qh
@@ -1,37 +1,38 @@
-#ifndef WEAPONSYSTEM_H
-#define WEAPONSYSTEM_H
+#pragma once
 
+#include <server/defs.qh>
+#include <server/miscfunctions.qh>
 
 float internalteam;
 float weaponswapping;
 entity weapon_dropevent_item;
 
-void CL_SpawnWeaponentity(entity e, int slot);
+..entity weaponentity_fld;
 
-vector CL_Weapon_GetShotOrg(float wpn);
+void CL_SpawnWeaponentity(entity e, .entity weaponentity);
 
-float forbidWeaponUse(entity player);
+vector CL_Weapon_GetShotOrg(float wpn);
 
-void W_AttachToShotorg(entity actor, entity flash, vector offset);
+bool forbidWeaponUse(entity player);
 
-void W_DecreaseAmmo(Weapon wep, entity actor, float ammo_use);
+void W_AttachToShotorg(entity actor, .entity weaponentity, entity flash, vector offset);
 
-void W_DropEvent(.void(Weapon) event, entity player, float weapon_type, entity weapon_item);
+void W_DecreaseAmmo(Weapon wep, entity actor, float ammo_use, .entity weaponentity);
 
-void W_Reload(entity actor, float sent_ammo_min, string sent_sound);
+void W_DropEvent(.void(Weapon, entity actor, .entity) event, entity player, float weapon_type, entity weapon_item, .entity weaponentity);
 
-void W_WeaponFrame(entity actor);
+void W_Reload(entity actor, .entity weaponentity, float sent_ammo_min, Sound sent_sound);
 
-float W_WeaponRateFactor();
+void W_WeaponFrame(Player actor, .entity weaponentity);
 
-float W_WeaponSpeedFactor();
+float W_WeaponRateFactor(entity this);
 
-bool weapon_prepareattack(Weapon thiswep, entity actor, int slot, bool secondary, float attacktime);
+float W_WeaponSpeedFactor(entity this);
 
-bool weapon_prepareattack_check(Weapon thiswep, entity actor, int slot, float secondary, float attacktime);
+bool weapon_prepareattack(Weapon thiswep, entity actor, .entity weaponentity, bool secondary, float attacktime);
 
-void weapon_prepareattack_do(entity actor, int slot, float secondary, float attacktime);
+bool weapon_prepareattack_check(Weapon thiswep, entity actor, .entity weaponentity, float secondary, float attacktime);
 
-void weapon_thinkf(entity actor, int slot, float fr, float t, void(Weapon thiswep, entity actor, int slot, int fire) func);
+void weapon_prepareattack_do(entity actor, .entity weaponentity, float secondary, float attacktime);
 
-#endif
+void weapon_thinkf(entity actor, .entity weaponentity, WFRAME fr, float t, void(Weapon thiswep, entity actor, .entity weaponentity, int fire) func);