X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fweapons%2Fweapon%2Fvaporizer.qc;fp=qcsrc%2Fcommon%2Fweapons%2Fweapon%2Fvaporizer.qc;h=e47f8fa909565a3734188c1f57d376cc1d1a5899;hb=fdbfb6f9364d8aeae67e108400a6bd1dd37dc0b7;hp=60e99348453033c02d2dd878c3121581abbeb6c6;hpb=0f2e3cd6c6554bda254111dee0746fea05aac047;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/common/weapons/weapon/vaporizer.qc b/qcsrc/common/weapons/weapon/vaporizer.qc index 60e993484..e47f8fa90 100644 --- a/qcsrc/common/weapons/weapon/vaporizer.qc +++ b/qcsrc/common/weapons/weapon/vaporizer.qc @@ -1,67 +1,4 @@ #include "vaporizer.qh" -#ifndef IMPLEMENTATION -CLASS(Vaporizer, Weapon) -/* ammotype */ ATTRIB(Vaporizer, ammo_field, .int, ammo_cells); -/* impulse */ ATTRIB(Vaporizer, impulse, int, 7); -/* flags */ ATTRIB(Vaporizer, spawnflags, int, WEP_FLAG_RELOADABLE | WEP_FLAG_CANCLIMB | WEP_FLAG_SUPERWEAPON | WEP_TYPE_HITSCAN); -/* rating */ ATTRIB(Vaporizer, bot_pickupbasevalue, float, 10000); -/* color */ ATTRIB(Vaporizer, wpcolor, vector, '0.5 1 1'); -/* modelname */ ATTRIB(Vaporizer, mdl, string, "minstanex"); -#ifdef GAMEQC -/* model */ ATTRIB(Vaporizer, m_model, Model, MDL_VAPORIZER_ITEM); -#endif -/* crosshair */ ATTRIB(Vaporizer, w_crosshair, string, "gfx/crosshairminstanex"); -/* crosshair */ ATTRIB(Vaporizer, w_crosshair_size, float, 0.6); -/* reticle */ ATTRIB(Vaporizer, w_reticle, string, "gfx/reticle_nex"); -/* wepimg */ ATTRIB(Vaporizer, model2, string, "weaponminstanex"); -/* refname */ ATTRIB(Vaporizer, netname, string, "vaporizer"); -/* wepname */ ATTRIB(Vaporizer, m_name, string, _("Vaporizer")); - -#define X(BEGIN, P, END, class, prefix) \ - BEGIN(class) \ - P(class, prefix, ammo, float, PRI) \ - P(class, prefix, animtime, float, PRI) \ - P(class, prefix, damage, float, PRI) \ - P(class, prefix, refire, float, PRI) \ - P(class, prefix, ammo, float, SEC) \ - P(class, prefix, animtime, float, SEC) \ - P(class, prefix, damage, float, SEC) \ - P(class, prefix, delay, float, SEC) \ - P(class, prefix, edgedamage, float, SEC) \ - P(class, prefix, force, float, SEC) \ - P(class, prefix, lifetime, float, SEC) \ - P(class, prefix, radius, float, SEC) \ - P(class, prefix, refire, float, SEC) \ - P(class, prefix, shotangle, float, SEC) \ - P(class, prefix, speed, float, SEC) \ - P(class, prefix, spread, float, SEC) \ - P(class, prefix, reload_ammo, float, NONE) \ - P(class, prefix, reload_time, float, NONE) \ - P(class, prefix, switchdelay_raise, float, NONE) \ - P(class, prefix, switchdelay_drop, float, NONE) \ - P(class, prefix, weaponreplace, string, NONE) \ - P(class, prefix, weaponstart, float, NONE) \ - P(class, prefix, weaponstartoverride, float, NONE) \ - P(class, prefix, weaponthrowable, float, NONE) \ - END() - W_PROPS(X, Vaporizer, vaporizer) -#undef X - -ENDCLASS(Vaporizer) -REGISTER_WEAPON(VAPORIZER, vaporizer, NEW(Vaporizer)); - - -#ifdef SVQC -.float vaporizer_lasthit; -.float jump_interval; -.float jump_interval2; -.bool held_down; -.float rm_force; -.float rm_damage; -.float rm_edmg; -#endif -#endif -#ifdef IMPLEMENTATION REGISTER_NET_TEMP(TE_CSQC_VAPORBEAMPARTICLE) @@ -515,4 +452,3 @@ METHOD(Vaporizer, wr_zoom, bool(entity thiswep, entity actor)) } #endif -#endif