#include "nexball.qh"
#ifdef IMPLEMENTATION
+#ifdef CSQC
+int autocvar_cl_eventchase_nexball = 1;
+
+REGISTER_MUTATOR(cl_nb, true);
+
+MUTATOR_HOOKFUNCTION(cl_nb, WantEventchase)
+{
+ if(autocvar_cl_eventchase_nexball && gametype == MAPINFO_TYPE_NEXBALL && !(WepSet_GetFromStat() & WEPSET(NEXBALL)))
+ return true;
+ return false;
+}
+#endif
#ifdef SVQC
.float metertime = _STAT(NB_METERSTART);
ResetBall(this);
}
-void nexball_setstatus()
-{SELFPARAM();
+void nexball_setstatus(entity this)
+{
this.items &= ~IT_KEY1;
if(this.ballcarried)
{
SpawnBall(this);
}
-float nb_Goal_Customize()
-{SELFPARAM();
+float nb_Goal_Customize(entity this)
+{
entity e, wp_owner;
e = WaypointSprite_getviewentity(other);
wp_owner = self.owner;
{
entity wp = WaypointSprite_SpawnFixed(WP_NbGoal, (this.absmin + this.absmax) * 0.5, this, sprite, RADARICON_NONE);
wp.colormod = ((this.team) ? Team_ColorRGB(this.team) : '1 0.5 0');
- this.sprite.customizeentityforclient = nb_Goal_Customize;
+ setcefc(this.sprite, nb_Goal_Customize);
}
this.classname = "nexball_goal";
void W_Nexball_Touch(entity this)
{
entity ball, attacker;
- attacker = self.owner;
- //self.think = func_null;
- //self.enemy = world;
+ attacker = this.owner;
+ //this.think = func_null;
+ //this.enemy = world;
PROJECTILE_TOUCH(this);
if(attacker.team != other.team || autocvar_g_nexball_basketball_teamsteal)
if((ball = other.ballcarried) && !STAT(FROZEN, other) && !IS_DEAD(other) && (IS_PLAYER(attacker)))
{
- other.velocity = other.velocity + normalize(self.velocity) * other.damageforcescale * autocvar_g_balance_nexball_secondary_force;
+ other.velocity = other.velocity + normalize(this.velocity) * other.damageforcescale * autocvar_g_balance_nexball_secondary_force;
UNSET_ONGROUND(other);
if(!attacker.ballcarried)
{
GiveBall(attacker, other.ballcarried);
}
}
- remove(self);
+ remove(this);
}
-void W_Nexball_Attack(float t)
-{SELFPARAM();
+void W_Nexball_Attack(entity actor, float t)
+{
entity ball;
float mul, mi, ma;
- if(!(ball = self.ballcarried))
+ if(!(ball = actor.ballcarried))
return;
- W_SetupShot(self, false, 4, SND_NB_SHOOT1, CH_WEAPON_A, 0);
+ W_SetupShot(actor, false, 4, SND_NB_SHOOT1, CH_WEAPON_A, 0);
tracebox(w_shotorg, BALL_MINS, BALL_MAXS, w_shotorg, MOVE_WORLDONLY, world);
if(trace_startsolid)
{
- if(self.metertime)
- self.metertime = 0; // Shot failed, hide the power meter
+ if(actor.metertime)
+ actor.metertime = 0; // Shot failed, hide the power meter
return;
}
mul = mi + (ma - mi) * mul; // range from the minimal power to the maximal power
}
- DropBall(ball, w_shotorg, W_CalculateProjectileVelocity(self.velocity, w_shotdir * autocvar_g_balance_nexball_primary_speed * mul, false));
+ DropBall(ball, w_shotorg, W_CalculateProjectileVelocity(actor, actor.velocity, w_shotdir * autocvar_g_balance_nexball_primary_speed * mul, false));
//TODO: use the speed_up cvar too ??
vector trigger_push_calculatevelocity(vector org, entity tgt, float ht);
-void W_Nexball_Attack2()
-{SELFPARAM();
- if(self.ballcarried.enemy)
+void W_Nexball_Attack2(entity actor)
+{
+ if(actor.ballcarried.enemy)
{
- entity _ball = self.ballcarried;
- W_SetupShot(self, false, 4, SND_NB_SHOOT1, CH_WEAPON_A, 0);
+ entity _ball = actor.ballcarried;
+ W_SetupShot(actor, false, 4, SND_NB_SHOOT1, CH_WEAPON_A, 0);
DropBall(_ball, w_shotorg, trigger_push_calculatevelocity(_ball.origin, _ball.enemy, 32));
setthink(_ball, W_Nexball_Think);
_ball.nextthink = time;
if(!autocvar_g_nexball_tackling)
return;
- W_SetupShot(self, false, 2, SND_NB_SHOOT2, CH_WEAPON_A, 0);
+ W_SetupShot(actor, false, 2, SND_NB_SHOOT2, CH_WEAPON_A, 0);
entity missile = new(ballstealer);
- missile.owner = self;
+ missile.owner = actor;
missile.movetype = MOVETYPE_FLY;
PROJECTILE_MAKETRIGGER(missile);
CSQCProjectile(missile, true, PROJECTILE_ELECTRO, true);
}
-float ball_customize()
-{SELFPARAM();
+float ball_customize(entity this)
+{
if(!self.owner)
{
self.effects &= ~EF_FLAME;
self.scale = 1;
- self.customizeentityforclient = func_null;
+ setcefc(self, func_null);
return true;
}
METHOD(BallStealer, wr_think, void(BallStealer thiswep, entity actor, .entity weaponentity, int fire))
{
- SELFPARAM();
TC(BallStealer, thiswep);
if(fire & 1)
if(weapon_prepareattack(thiswep, actor, weaponentity, false, autocvar_g_balance_nexball_primary_refire))
if(autocvar_g_nexball_basketball_meter)
{
- if(self.ballcarried && !self.metertime)
- self.metertime = time;
+ if(actor.ballcarried && !actor.metertime)
+ actor.metertime = time;
else
weapon_thinkf(actor, weaponentity, WFRAME_FIRE1, autocvar_g_balance_nexball_primary_animtime, w_ready);
}
else
{
- W_Nexball_Attack(-1);
+ W_Nexball_Attack(actor, -1);
weapon_thinkf(actor, weaponentity, WFRAME_FIRE1, autocvar_g_balance_nexball_primary_animtime, w_ready);
}
if(fire & 2)
if(weapon_prepareattack(thiswep, actor, weaponentity, true, autocvar_g_balance_nexball_secondary_refire))
{
- W_Nexball_Attack2();
+ W_Nexball_Attack2(actor);
weapon_thinkf(actor, weaponentity, WFRAME_FIRE2, autocvar_g_balance_nexball_secondary_animtime, w_ready);
}
- if(!(fire & 1) && self.metertime && self.ballcarried)
+ if(!(fire & 1) && actor.metertime && actor.ballcarried)
{
- W_Nexball_Attack(time - self.metertime);
+ W_Nexball_Attack(actor, time - actor.metertime);
// DropBall or stealing will set metertime back to 0
weapon_thinkf(actor, weaponentity, WFRAME_FIRE1, autocvar_g_balance_nexball_primary_animtime, w_ready);
}
}
MUTATOR_HOOKFUNCTION(nb, ClientDisconnect)
-{SELFPARAM();
- nb_DropBall(self);
- return false;
+{
+ entity player = M_ARGV(0, entity);
+
+ nb_DropBall(player);
}
MUTATOR_HOOKFUNCTION(nb, PlayerDies)
{
+ entity frag_target = M_ARGV(2, entity);
+
nb_DropBall(frag_target);
- return false;
}
MUTATOR_HOOKFUNCTION(nb, MakePlayerObserver)
-{SELFPARAM();
- nb_DropBall(self);
+{
+ entity player = M_ARGV(0, entity);
+
+ nb_DropBall(player);
return false;
}
{
// 'view ball'
self.ballcarried.velocity = self.velocity;
- self.ballcarried.customizeentityforclient = ball_customize;
+ setcefc(self.ballcarried, ball_customize);
vector org = self.origin + self.view_ofs +
v_forward * autocvar_g_nexball_viewmodel_offset.x +
}
- nexball_setstatus();
+ nexball_setstatus(self);
return false;
}
MUTATOR_HOOKFUNCTION(nb, SpectateCopy)
{
- SELFPARAM();
- this.metertime = other.metertime;
+ entity spectatee = M_ARGV(0, entity);
+ entity client = M_ARGV(1, entity);
+
+ client.metertime = spectatee.metertime;
}
MUTATOR_HOOKFUNCTION(nb, PlayerSpawn)
{
- SELFPARAM();
- this.metertime = 0;
+ entity player = M_ARGV(0, entity);
+
+ player.metertime = 0;
.entity weaponentity = weaponentities[0];
- this.(weaponentity).weapons = '0 0 0';
+ player.(weaponentity).weapons = '0 0 0';
if (nexball_mode & NBM_BASKETBALL)
- this.weapons |= WEPSET(NEXBALL);
+ player.weapons |= WEPSET(NEXBALL);
else
- this.weapons = '0 0 0';
+ player.weapons = '0 0 0';
return false;
}
}
MUTATOR_HOOKFUNCTION(nb, ForbidThrowCurrentWeapon)
-{SELFPARAM();
- return PS(self).m_weapon == WEP_NEXBALL;
+{
+ entity player = M_ARGV(0, entity);
+
+ return PS(player).m_weapon == WEP_NEXBALL;
}
MUTATOR_HOOKFUNCTION(nb, ForbidDropCurrentWeapon)
-{SELFPARAM();
- return PS(self).m_weapon == WEP_MORTAR; // TODO: what is this for?
+{
+ entity player = M_ARGV(0, entity);
+
+ return PS(player).m_weapon == WEP_MORTAR; // TODO: what is this for?
}
MUTATOR_HOOKFUNCTION(nb, FilterItem)
-{SELFPARAM();
- if(self.classname == "droppedweapon")
- if(self.weapon == WEP_NEXBALL.m_id)
+{
+ entity item = M_ARGV(0, entity);
+
+ if(item.classname == "droppedweapon")
+ if(item.weapon == WEP_NEXBALL.m_id)
return true;
return false;
MUTATOR_HOOKFUNCTION(nb, GetTeamCount)
{
- ret_string = "nexball_team";
+ M_ARGV(1, string) = "nexball_team";
return true;
}
MUTATOR_HOOKFUNCTION(nb, WantWeapon)
{
- ret_float = 0; // weapon is set a few lines later, apparently
+ M_ARGV(1, float) = 0; // weapon is set a few lines later, apparently
return true;
}
MUTATOR_HOOKFUNCTION(nb, DropSpecialItems)
{
+ entity frag_target = M_ARGV(0, entity);
+
if(frag_target.ballcarried)
DropBall(frag_target.ballcarried, frag_target.origin, frag_target.velocity);
projects / xonotic / xonotic-data.pk3dir.git / blobdiff