Merge branch 'master' into terencehill/translate_colors_2

[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 0000ac2155b762298e15bbb956187955cbec7fb5..74d120150fc788e917a591beeb98e2c1f7655818 100644 (file)
--- a/qcsrc/server/weapons/weaponsystem.qh
+++ b/qcsrc/server/weapons/weaponsystem.qh
@@ -1,6 +1,4 @@
-#ifndef WEAPONSYSTEM_H
-#define WEAPONSYSTEM_H
-
+#pragma once
 
 float internalteam;
 float weaponswapping;
@@ -18,9 +16,9 @@ void W_DecreaseAmmo(Weapon wep, entity actor, float ammo_use);
 
 void W_DropEvent(.void(Weapon) event, entity player, float weapon_type, entity weapon_item);
 
-void W_Reload(entity actor, float sent_ammo_min, string sent_sound);
+void W_Reload(entity actor, float sent_ammo_min, Sound sent_sound);
 
-void W_WeaponFrame(entity actor);
+void W_WeaponFrame(Player actor);
 
 float W_WeaponRateFactor();
 
@@ -33,5 +31,3 @@ bool weapon_prepareattack_check(Weapon thiswep, entity actor, .entity weaponenti
 void weapon_prepareattack_do(entity actor, .entity weaponentity, float secondary, float attacktime);
 
 void weapon_thinkf(entity actor, .entity weaponentity, WFRAME fr, float t, void(Weapon thiswep, entity actor, .entity weaponentity, int fire) func);
-
-#endif