-#ifndef WEAPONSYSTEM_H
-#define WEAPONSYSTEM_H
-
-.float wframe;
+#pragma once
float internalteam;
float weaponswapping;
entity weapon_dropevent_item;
-// VorteX: static frame globals
-const float WFRAME_DONTCHANGE = -1;
-const float WFRAME_FIRE1 = 0;
-const float WFRAME_FIRE2 = 1;
-const float WFRAME_IDLE = 2;
-const float WFRAME_RELOAD = 3;
-
-void CL_SpawnWeaponentity(entity e);
+void CL_SpawnWeaponentity(entity e, .entity weaponentity);
vector CL_Weapon_GetShotOrg(float wpn);
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();
float W_WeaponSpeedFactor();
-bool weapon_prepareattack(entity actor, bool secondary, float attacktime);
-
-bool weapon_prepareattack_check(entity actor, float secondary, float attacktime);
+bool weapon_prepareattack(Weapon thiswep, entity actor, .entity weaponentity, bool secondary, float attacktime);
-void weapon_prepareattack_do(entity actor, float secondary, float attacktime);
+bool weapon_prepareattack_check(Weapon thiswep, entity actor, .entity weaponentity, float secondary, float attacktime);
-void weapon_thinkf(entity actor, float fr, float t, void(Weapon thiswep, entity actor, bool fire1, bool fire2) 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);