+#ifndef WEAPONS_C
+#define WEAPONS_C
+
+#include "weapons.qh"
+
#if defined(CSQC)
#include "../../dpdefs/csprogsdefs.qh"
#include "../../client/defs.qh"
#include "../../warpzonelib/client.qh"
#include "../util.qh"
#include "../buffs.qh"
- #include "weapons.qh"
#include "../../client/autocvars.qh"
#include "../deathtypes.qh"
#include "../../csqcmodellib/interpolate.qh"
- #include "../../client/movetypes.qh"
+ #include "../movetypes/movetypes.qh"
#include "../../client/main.qh"
#include "../../csqcmodellib/cl_model.qh"
#elif defined(MENUQC)
#elif defined(SVQC)
#include "../../dpdefs/progsdefs.qh"
#include "../../dpdefs/dpextensions.qh"
- #include "../../server/sys-post.qh"
#include "../../warpzonelib/anglestransform.qh"
#include "../../warpzonelib/mathlib.qh"
#include "../../warpzonelib/common.qh"
#include "../buffs.qh"
#include "../monsters/monsters.qh"
#include "config.qh"
- #include "weapons.qh"
#include "../../server/weapons/csqcprojectile.qh"
#include "../../server/weapons/tracing.qh"
#include "../../server/t_items.qh"
WepSet WepSet_GetFromStat()
{
WepSet w = '0 0 0';
- w_x = getstati(STAT_WEAPONS);
+ w.x = getstati(STAT_WEAPONS);
#if WEP_MAXCOUNT > 24
- w_y = getstati(STAT_WEAPONS2);
+ w.y = getstati(STAT_WEAPONS2);
#if WEP_MAXCOUNT > 48
- w_z = getstati(STAT_WEAPONS3);
+ w.z = getstati(STAT_WEAPONS3);
#endif
#endif
return w;
e.netname = refname;
e.message = wepname;
- #ifndef MENUQC
+ #ifdef CSQC
func(WR_INIT);
#endif
}
dummy_weapon_info.w_crosshair_size = 1;
dummy_weapon_info.model2 = "";
- float i;
+ int i;
weaponorder_byid = "";
for(i = WEP_MAXCOUNT; i >= 1; --i)
if(weapon_info[i-1])
switch ( s )
{
case "nex" : return "vortex";
- case "rocketlauncher" : return "devastator";
+ case "rocketlauncher" : return "devastator";
case "laser" : return "blaster";
case "minstanex" : return "vaporizer";
case "grenadelauncher": return "mortar";
}
#ifdef CSQC
-.float GetAmmoFieldFromNum(float i)
+.float GetAmmoFieldFromNum(int i)
{
switch(i)
{
}
}
-float GetAmmoStat(.float ammotype)
+int GetAmmoStat(.float ammotype)
{
switch(ammotype)
{
}
}
#endif
+#endif