+#if defined(CSQC)
+ #include "../../dpdefs/csprogsdefs.qh"
+ #include "../../client/defs.qh"
+ #include "../constants.qh"
+ #include "../stats.qh"
+ #include "../../warpzonelib/anglestransform.qh"
+ #include "../../warpzonelib/mathlib.qh"
+ #include "../../warpzonelib/common.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 "../../client/main.qh"
+ #include "../../csqcmodellib/cl_model.qh"
+#elif defined(MENUQC)
+#elif defined(SVQC)
+ #include "../../dpdefs/progsdefs.qh"
+ #include "../../dpdefs/dpextensions.qh"
+ #include "../../warpzonelib/anglestransform.qh"
+ #include "../../warpzonelib/mathlib.qh"
+ #include "../../warpzonelib/common.qh"
+ #include "../../warpzonelib/util_server.qh"
+ #include "../../warpzonelib/server.qh"
+ #include "../constants.qh"
+ #include "../stats.qh"
+ #include "../teams.qh"
+ #include "../util.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"
+ #include "../../server/autocvars.qh"
+ #include "../../server/constants.qh"
+ #include "../../server/defs.qh"
+ #include "../notifications.qh"
+ #include "../deathtypes.qh"
+ #include "../../server/mutators/mutators_include.qh"
+ #include "../mapinfo.qh"
+ #include "../../server/command/common.qh"
+ #include "../../csqcmodellib/sv_model.qh"
+ #include "../../server/portals.qh"
+ #include "../../server/g_hook.qh"
+#endif
#ifndef MENUQC
#include "calculations.qc"
#endif
#elif WEP_MAXCOUNT > 24
WriteInt48_t(dst, w);
#else
- WriteInt24_t(dst, w_x);
+ WriteInt24_t(dst, w.x);
#endif
}
#endif
#endif
void register_weapon(
- float id,
+ int id,
WepSet bit,
float(float) func,
.float ammotype,
float pickupbasevalue,
vector clr,
string modelname,
- string shortname,
- string wname)
+ string simplemdl,
+ string crosshair,
+ string wepimg,
+ string refname,
+ string wepname)
{
entity e;
weapon_info[id - 1] = e = spawn();
e.classname = "weapon_info";
e.weapon = id;
e.weapons = bit;
- e.netname = shortname;
- e.message = wname;
e.weapon_func = func;
+ e.ammo_field = ammotype;
+ e.impulse = i;
+ e.spawnflags = weapontype;
+ e.bot_pickupbasevalue = pickupbasevalue;
e.wpcolor = clr;
+ e.wpmodel = strzone(strcat("wpn-", ftos(id)));
e.mdl = modelname;
e.model = strzone(strcat("models/weapons/g_", modelname, ".md3"));
- e.spawnflags = weapontype;
- e.model2 = strzone(strcat("wpn-", ftos(id)));
- e.impulse = i;
- e.bot_pickupbasevalue = pickupbasevalue;
- e.ammo_field = ammotype;
+ e.w_simplemdl = strzone(simplemdl); // simpleitems weapon model/image
+ e.w_crosshair = strzone(car(crosshair));
+ string s = cdr(crosshair);
+ e.w_crosshair_size = ((s != "") ? stof(s) : 1); // so that we can scale the crosshair from code (for compat)
+ e.model2 = strzone(wepimg);
+ e.netname = refname;
+ e.message = wepname;
#ifndef MENUQC
func(WR_INIT);
dummy_weapon_info.netname = "";
dummy_weapon_info.message = "AOL CD Thrower";
dummy_weapon_info.weapon_func = w_null;
+ dummy_weapon_info.wpmodel = "";
dummy_weapon_info.mdl = "";
dummy_weapon_info.model = "";
dummy_weapon_info.spawnflags = 0;
- dummy_weapon_info.model2 = "";
dummy_weapon_info.impulse = -1;
dummy_weapon_info.bot_pickupbasevalue = 0;
dummy_weapon_info.ammo_field = ammo_none;
+ dummy_weapon_info.w_crosshair = "gfx/crosshair1";
+ dummy_weapon_info.w_crosshair_size = 1;
+ dummy_weapon_info.model2 = "";
+
float i;
weaponorder_byid = "";
for(i = WEP_MAXCOUNT; i >= 1; --i)
weaponorder_byid = strcat(weaponorder_byid, " ", ftos(i));
weaponorder_byid = strzone(substring(weaponorder_byid, 1, strlen(weaponorder_byid) - 1));
}
-entity get_weaponinfo(float id)
+entity get_weaponinfo(int id)
{
entity w;
if(id < WEP_FIRST || id > WEP_LAST)
}
return s;
}
+
+string W_UndeprecateName(string s)
+{
+ switch ( s )
+ {
+ case "nex" : return "vortex";
+ case "rocketlauncher" : return "devastator";
+ case "laser" : return "blaster";
+ case "minstanex" : return "vaporizer";
+ case "grenadelauncher": return "mortar";
+ case "uzi" : return "machinegun";
+ default : return s;
+ }
+}
string W_NameWeaponOrder(string order)
{
return mapPriorityList(order, W_NameWeaponOrder_MapFunc);
float i;
if(s == "0" || stof(s))
return s;
+ s = W_UndeprecateName(s);
for(i = WEP_FIRST; i <= WEP_LAST; ++i)
if(s == get_weaponinfo(i).netname)
return ftos(i);
float W_FixWeaponOrder_BuildImpulseList_buf[WEP_MAXCOUNT];
string W_FixWeaponOrder_BuildImpulseList_order;
-void W_FixWeaponOrder_BuildImpulseList_swap(float i, float j, entity pass)
+void W_FixWeaponOrder_BuildImpulseList_swap(int i, int j, entity pass)
{
float h;
h = W_FixWeaponOrder_BuildImpulseList_buf[i];
W_FixWeaponOrder_BuildImpulseList_buf[i] = W_FixWeaponOrder_BuildImpulseList_buf[j];
W_FixWeaponOrder_BuildImpulseList_buf[j] = h;
}
-float W_FixWeaponOrder_BuildImpulseList_cmp(float i, float j, entity pass)
+float W_FixWeaponOrder_BuildImpulseList_cmp(int i, int j, entity pass)
{
entity e1, e2;
float d;
e1 = get_weaponinfo(W_FixWeaponOrder_BuildImpulseList_buf[i]);
e2 = get_weaponinfo(W_FixWeaponOrder_BuildImpulseList_buf[j]);
- d = mod(e1.impulse + 9, 10) - mod(e2.impulse + 9, 10);
+ d = (e1.impulse + 9) % 10 - (e2.impulse + 9) % 10;
if(d != 0)
return -d; // high impulse first!
return
}
string W_FixWeaponOrder_BuildImpulseList(string o)
{
- float i;
+ int i;
W_FixWeaponOrder_BuildImpulseList_order = o;
for(i = WEP_FIRST; i <= WEP_LAST; ++i)
W_FixWeaponOrder_BuildImpulseList_buf[i - WEP_FIRST] = i;
e.weapons = result;
}
+string GetAmmoPicture(.float ammotype)
+{
+ switch(ammotype)
+ {
+ case ammo_shells: return "ammo_shells";
+ case ammo_nails: return "ammo_bullets";
+ case ammo_rockets: return "ammo_rockets";
+ case ammo_cells: return "ammo_cells";
+ case ammo_plasma: return "ammo_cells";
+ case ammo_fuel: return "ammo_fuel";
+ default: return ""; // wtf, no ammo type?
+ }
+}
+
#ifdef CSQC
.float GetAmmoFieldFromNum(float i)
{
case 1: return ammo_nails;
case 2: return ammo_rockets;
case 3: return ammo_cells;
- case 4: return ammo_fuel;
+ case 4: return ammo_plasma;
+ case 5: return ammo_fuel;
default: return ammo_none;
}
}
-string GetAmmoPicture(.float ammotype)
-{
- switch(ammotype)
- {
- case ammo_shells: return "ammo_shells";
- case ammo_nails: return "ammo_nails";
- case ammo_rockets: return "ammo_rockets";
- case ammo_cells: return "ammo_cells";
- case ammo_fuel: return "ammo_fuel";
- default: return ""; // wtf, no ammo type?
- }
-}
-
float GetAmmoStat(.float ammotype)
{
switch(ammotype)
case ammo_nails: return STAT_NAILS;
case ammo_rockets: return STAT_ROCKETS;
case ammo_cells: return STAT_CELLS;
+ case ammo_plasma: return STAT_PLASMA;
case ammo_fuel: return STAT_FUEL;
default: return -1;
}
projects / xonotic / xonotic-data.pk3dir.git / blobdiff