X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fweapons%2Fweapon%2Fporto.qc;h=d9f919cc4a4253058a65d1b5d410d4d4fb5cd20b;hb=02f618451f5c061d2b1e407fac81fed18a636726;hp=916e5c844ac4b5ce7df808a5195ed382559fa8e2;hpb=2b728b9c59ef61318b7ca5a261cb7fa45d2143aa;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/common/weapons/weapon/porto.qc b/qcsrc/common/weapons/weapon/porto.qc index 916e5c844..d9f919cc4 100644 --- a/qcsrc/common/weapons/weapon/porto.qc +++ b/qcsrc/common/weapons/weapon/porto.qc @@ -14,25 +14,27 @@ CLASS(PortoLaunch, Weapon) /* wepimg */ ATTRIB(PortoLaunch, model2, string, "weaponporto"); /* refname */ ATTRIB(PortoLaunch, netname, string, "porto"); /* wepname */ ATTRIB(PortoLaunch, m_name, string, _("Port-O-Launch")); + +#define X(BEGIN, P, END, class, prefix) \ + BEGIN(class) \ + P(class, prefix, animtime, float, BOTH) \ + P(class, prefix, lifetime, float, BOTH) \ + P(class, prefix, refire, float, BOTH) \ + P(class, prefix, secondary, float, NONE) \ + P(class, prefix, speed, float, BOTH) \ + P(class, prefix, switchdelay_drop, float, NONE) \ + P(class, prefix, switchdelay_raise, float, NONE) \ + P(class, prefix, weaponreplace, string,NONE) \ + P(class, prefix, weaponstartoverride, float, NONE) \ + P(class, prefix, weaponstart, float, NONE) \ + P(class, prefix, weaponthrowable, float, NONE) \ + END() + W_PROPS(X, PortoLaunch, porto) +#undef X ENDCLASS(PortoLaunch) -REGISTER_WEAPON(PORTO, NEW(PortoLaunch)); - -#define PORTO_SETTINGS(w_cvar,w_prop) PORTO_SETTINGS_LIST(w_cvar, w_prop, PORTO, porto) -#define PORTO_SETTINGS_LIST(w_cvar,w_prop,id,sn) \ - w_cvar(id, sn, BOTH, animtime) \ - w_cvar(id, sn, BOTH, lifetime) \ - w_cvar(id, sn, BOTH, refire) \ - w_cvar(id, sn, BOTH, speed) \ - w_cvar(id, sn, NONE, secondary) \ - w_prop(id, sn, float, switchdelay_raise, switchdelay_raise) \ - w_prop(id, sn, float, switchdelay_drop, switchdelay_drop) \ - w_prop(id, sn, string, weaponreplace, weaponreplace) \ - w_prop(id, sn, float, weaponstart, weaponstart) \ - w_prop(id, sn, float, weaponstartoverride, weaponstartoverride) \ - w_prop(id, sn, float, weaponthrowable, weaponthrowable) +REGISTER_WEAPON(PORTO, porto, NEW(PortoLaunch)); #ifdef SVQC -PORTO_SETTINGS(WEP_ADD_CVAR, WEP_ADD_PROP) .entity porto_current; .vector porto_v_angle; // holds "held" view angles .float porto_v_angle_held; @@ -42,18 +44,16 @@ PORTO_SETTINGS(WEP_ADD_CVAR, WEP_ADD_PROP) #endif #ifdef IMPLEMENTATION #ifdef SVQC -#include "../../triggers/trigger/jumppads.qh" +#include spawnfunc(weapon_porto) { weapon_defaultspawnfunc(this, WEP_PORTO); } REGISTER_MUTATOR(porto_ticker, true); MUTATOR_HOOKFUNCTION(porto_ticker, SV_StartFrame) { - entity e; - FOR_EACH_PLAYER(e) - e.porto_forbidden = max(0, e.porto_forbidden - 1); + FOREACH_CLIENT(IS_PLAYER(it), it.porto_forbidden = max(0, it.porto_forbidden - 1)); } -void W_Porto_Success(void) +void W_Porto_Success() {SELFPARAM(); if(self.realowner == world) { @@ -82,7 +82,7 @@ void W_Porto_Fail(float failhard) self.realowner.porto_current = world; - if(self.cnt < 0 && !failhard && self.realowner.playerid == self.playerid && self.realowner.deadflag == DEAD_NO && !(self.realowner.weapons & WEPSET(PORTO))) + if(self.cnt < 0 && !failhard && self.realowner.playerid == self.playerid && !IS_DEAD(self.realowner) && !(self.realowner.weapons & WEPSET(PORTO))) { setsize(self, '-16 -16 0', '16 16 32'); setorigin(self, self.origin + trace_plane_normal); @@ -91,7 +91,7 @@ void W_Porto_Fail(float failhard) self.flags = FL_ITEM; self.velocity = trigger_push_calculatevelocity(self.origin, self.realowner, 128); tracetoss(self, self); - if(vlen(trace_endpos - self.realowner.origin) < 128) + if(vdist(trace_endpos - self.realowner.origin, <, 128)) { W_ThrowNewWeapon(self.realowner, WEP_PORTO.m_id, 0, self.origin, self.velocity); Send_Notification(NOTIF_ONE, self.realowner, MSG_CENTER, CENTER_PORTO_FAILED); @@ -109,7 +109,7 @@ void W_Porto_Remove(entity p) } } -void W_Porto_Think(void) +void W_Porto_Think() {SELFPARAM(); trace_plane_normal = '0 0 0'; if(self.realowner.playerid != self.playerid) @@ -118,7 +118,7 @@ void W_Porto_Think(void) W_Porto_Fail(0); } -void W_Porto_Touch(void) +void W_Porto_Touch() {SELFPARAM(); vector norm; @@ -131,7 +131,7 @@ void W_Porto_Touch(void) norm = trace_plane_normal; if(trace_ent.iscreature) { - traceline(trace_ent.origin, trace_ent.origin + '0 0 2' * PL_MIN.z, MOVE_WORLDONLY, self); + traceline(trace_ent.origin, trace_ent.origin + '0 0 2' * STAT(PL_MIN, NULL).z, MOVE_WORLDONLY, self); if(trace_fraction >= 1) return; if(trace_dphitq3surfaceflags & Q3SURFACEFLAG_SLICK || trace_dphitcontents & DPCONTENTS_PLAYERCLIP) @@ -244,7 +244,7 @@ void W_Porto_Attack(float type) {SELFPARAM(); entity gren; - W_SetupShot(self, false, 4, SND(PORTO_FIRE), CH_WEAPON_A, 0); + W_SetupShot(self, false, 4, SND_PORTO_FIRE, CH_WEAPON_A, 0); // always shoot from the eye w_shotdir = v_forward; w_shotorg = self.origin + self.view_ofs + ((w_shotorg - self.origin - self.view_ofs) * v_forward) * v_forward; @@ -292,103 +292,95 @@ void W_Porto_Attack(float type) MUTATOR_CALLHOOK(EditProjectile, self, gren); } - METHOD(PortoLaunch, wr_aim, void(entity thiswep)) - { - SELFPARAM(); - self.BUTTON_ATCK = false; - self.BUTTON_ATCK2 = false; - if(!WEP_CVAR(porto, secondary)) - if(bot_aim(WEP_CVAR_PRI(porto, speed), 0, WEP_CVAR_PRI(porto, lifetime), false)) - self.BUTTON_ATCK = true; - } - METHOD(PortoLaunch, wr_config, void(entity this)) - { - PORTO_SETTINGS(WEP_CONFIG_WRITE_CVARS, WEP_CONFIG_WRITE_PROPS); - } - METHOD(PortoLaunch, wr_think, void(entity thiswep, entity actor, .entity weaponentity, int fire)) - { - if(WEP_CVAR(porto, secondary)) - { - if(fire & 1) - if(!actor.porto_current) - if(!actor.porto_forbidden) - if(weapon_prepareattack(thiswep, actor, weaponentity, false, WEP_CVAR_PRI(porto, refire))) - { - W_Porto_Attack(0); - weapon_thinkf(actor, weaponentity, WFRAME_FIRE1, WEP_CVAR_PRI(porto, animtime), w_ready); - } - - if(fire & 2) - if(!actor.porto_current) - if(!actor.porto_forbidden) - if(weapon_prepareattack(thiswep, actor, weaponentity, true, WEP_CVAR_SEC(porto, refire))) - { - W_Porto_Attack(1); - weapon_thinkf(actor, weaponentity, WFRAME_FIRE2, WEP_CVAR_SEC(porto, animtime), w_ready); - } - } - else - { - if(actor.porto_v_angle_held) - { - if(!(fire & 2)) - { - actor.porto_v_angle_held = 0; - - ClientData_Touch(actor); - } - } - else - { - if(fire & 2) - { - actor.porto_v_angle = actor.v_angle; - actor.porto_v_angle_held = 1; - - ClientData_Touch(actor); - } - } - if(actor.porto_v_angle_held) - makevectors(actor.porto_v_angle); // override the previously set angles - - if(fire & 1) - if(!actor.porto_current) - if(!actor.porto_forbidden) - if(weapon_prepareattack(thiswep, actor, weaponentity, false, WEP_CVAR_PRI(porto, refire))) - { - W_Porto_Attack(-1); - weapon_thinkf(actor, weaponentity, WFRAME_FIRE1, WEP_CVAR_PRI(porto, animtime), w_ready); - } - } - } - METHOD(PortoLaunch, wr_checkammo1, bool(entity this)) - { - // always allow infinite ammo - return true; - } - METHOD(PortoLaunch, wr_checkammo2, bool(entity this)) - { - // always allow infinite ammo - return true; - } - METHOD(PortoLaunch, wr_init, void(entity this)) - { - PORTO_SETTINGS(WEP_SKIP_CVAR, WEP_SET_PROP); - } - METHOD(PortoLaunch, wr_setup, void(entity thiswep)) - { - SELFPARAM(); - self.ammo_field = ammo_none; - } - METHOD(PortoLaunch, wr_resetplayer, void(entity thiswep)) - { - SELFPARAM(); - self.porto_current = world; - } +METHOD(PortoLaunch, wr_aim, void(entity thiswep)) +{ + SELFPARAM(); + PHYS_INPUT_BUTTON_ATCK(self) = false; + PHYS_INPUT_BUTTON_ATCK2(self) = false; + if(!WEP_CVAR(porto, secondary)) + if(bot_aim(WEP_CVAR_PRI(porto, speed), 0, WEP_CVAR_PRI(porto, lifetime), false)) + PHYS_INPUT_BUTTON_ATCK(self) = true; +} +METHOD(PortoLaunch, wr_think, void(entity thiswep, entity actor, .entity weaponentity, int fire)) +{ + if(WEP_CVAR(porto, secondary)) + { + if(fire & 1) + if(!actor.porto_current) + if(!actor.porto_forbidden) + if(weapon_prepareattack(thiswep, actor, weaponentity, false, WEP_CVAR_PRI(porto, refire))) + { + W_Porto_Attack(0); + weapon_thinkf(actor, weaponentity, WFRAME_FIRE1, WEP_CVAR_PRI(porto, animtime), w_ready); + } + + if(fire & 2) + if(!actor.porto_current) + if(!actor.porto_forbidden) + if(weapon_prepareattack(thiswep, actor, weaponentity, true, WEP_CVAR_SEC(porto, refire))) + { + W_Porto_Attack(1); + weapon_thinkf(actor, weaponentity, WFRAME_FIRE2, WEP_CVAR_SEC(porto, animtime), w_ready); + } + } + else + { + if(actor.porto_v_angle_held) + { + if(!(fire & 2)) + { + actor.porto_v_angle_held = 0; + + ClientData_Touch(actor); + } + } + else + { + if(fire & 2) + { + actor.porto_v_angle = actor.v_angle; + actor.porto_v_angle_held = 1; + + ClientData_Touch(actor); + } + } + if(actor.porto_v_angle_held) + makevectors(actor.porto_v_angle); // override the previously set angles + + if(fire & 1) + if(!actor.porto_current) + if(!actor.porto_forbidden) + if(weapon_prepareattack(thiswep, actor, weaponentity, false, WEP_CVAR_PRI(porto, refire))) + { + W_Porto_Attack(-1); + weapon_thinkf(actor, weaponentity, WFRAME_FIRE1, WEP_CVAR_PRI(porto, animtime), w_ready); + } + } +} +METHOD(PortoLaunch, wr_checkammo1, bool(entity this)) +{ + // always allow infinite ammo + return true; +} +METHOD(PortoLaunch, wr_checkammo2, bool(entity this)) +{ + // always allow infinite ammo + return true; +} +METHOD(PortoLaunch, wr_setup, void(entity thiswep)) +{ + SELFPARAM(); + self.ammo_field = ammo_none; +} +METHOD(PortoLaunch, wr_resetplayer, void(entity thiswep)) +{ + SELFPARAM(); + self.porto_current = world; +} #endif #ifdef CSQC - METHOD(PortoLaunch, wr_impacteffect, void(entity this)) { - LOG_WARNING("Since when does Porto send DamageInfo?\n"); - } +METHOD(PortoLaunch, wr_impacteffect, void(entity this)) { + LOG_WARNING("Since when does Porto send DamageInfo?\n"); +} #endif #endif