MUTATOR_HOOKFUNCTION(cl_nades, HUD_Draw_overlay)
{
if (STAT(HEALING_ORB) <= time) return false;
- MUTATOR_ARGV(0, vector) = NADE_TYPE_HEAL.m_color;
- MUTATOR_ARGV(0, float) = STAT(HEALING_ORB_ALPHA);
+ M_ARGV(0, vector) = NADE_TYPE_HEAL.m_color;
+ M_ARGV(1, float) = STAT(HEALING_ORB_ALPHA);
return true;
}
MUTATOR_HOOKFUNCTION(cl_nades, Ent_Projectile)
{
- SELFPARAM();
- if (self.cnt == PROJECTILE_NAPALM_FOUNTAIN)
+ entity proj = M_ARGV(0, entity);
+
+ if (proj.cnt == PROJECTILE_NAPALM_FOUNTAIN)
{
- self.modelindex = 0;
- self.traileffect = EFFECT_FIREBALL.m_id;
+ proj.modelindex = 0;
+ proj.traileffect = EFFECT_FIREBALL.m_id;
return true;
}
- if (Nade_FromProjectile(self.cnt) != NADE_TYPE_Null)
+ if (Nade_FromProjectile(proj.cnt) != NADE_TYPE_Null)
{
- setmodel(self, MDL_PROJECTILE_NADE);
- entity trail = Nade_TrailEffect(self.cnt, self.team);
- if (trail.eent_eff_name) self.traileffect = trail.m_id;
+ setmodel(proj, MDL_PROJECTILE_NADE);
+ entity trail = Nade_TrailEffect(proj.cnt, proj.team);
+ if (trail.eent_eff_name) proj.traileffect = trail.m_id;
return true;
}
}
MUTATOR_HOOKFUNCTION(cl_nades, EditProjectile)
{
- SELFPARAM();
- if (self.cnt == PROJECTILE_NAPALM_FOUNTAIN)
+ entity proj = M_ARGV(0, entity);
+
+ if (proj.cnt == PROJECTILE_NAPALM_FOUNTAIN)
{
- loopsound(self, CH_SHOTS_SINGLE, SND(FIREBALL_FLY2), VOL_BASE, ATTEN_NORM);
- self.mins = '-16 -16 -16';
- self.maxs = '16 16 16';
+ loopsound(proj, CH_SHOTS_SINGLE, SND(FIREBALL_FLY2), VOL_BASE, ATTEN_NORM);
+ proj.mins = '-16 -16 -16';
+ proj.maxs = '16 16 16';
}
- entity nade_type = Nade_FromProjectile(self.cnt);
+ entity nade_type = Nade_FromProjectile(proj.cnt);
if (nade_type == NADE_TYPE_Null) return;
if(STAT(NADES_SMALL, NULL))
{
- self.mins = '-8 -8 -8';
- self.maxs = '8 8 8';
+ proj.mins = '-8 -8 -8';
+ proj.maxs = '8 8 8';
}
else
{
- self.mins = '-16 -16 -16';
- self.maxs = '16 16 16';
+ proj.mins = '-16 -16 -16';
+ proj.maxs = '16 16 16';
}
- self.colormod = nade_type.m_color;
- self.move_movetype = MOVETYPE_BOUNCE;
- self.move_touch = func_null;
- self.scale = 1.5;
- self.avelocity = randomvec() * 720;
+ proj.colormod = nade_type.m_color;
+ proj.move_movetype = MOVETYPE_BOUNCE;
+ settouch(proj, func_null);
+ proj.scale = 1.5;
+ proj.avelocity = randomvec() * 720;
if (nade_type == NADE_TYPE_TRANSLOCATE || nade_type == NADE_TYPE_SPAWN)
- self.dphitcontentsmask = DPCONTENTS_SOLID | DPCONTENTS_PLAYERCLIP | DPCONTENTS_BOTCLIP;
+ proj.dphitcontentsmask = DPCONTENTS_SOLID | DPCONTENTS_PLAYERCLIP | DPCONTENTS_BOTCLIP;
else
- self.dphitcontentsmask = DPCONTENTS_SOLID | DPCONTENTS_BODY;
+ proj.dphitcontentsmask = DPCONTENTS_SOLID | DPCONTENTS_BODY;
}
bool Projectile_isnade(int p)
{
.entity nade_spawnloc;
-void nade_timer_think()
-{SELFPARAM();
- self.skin = 8 - (self.owner.wait - time) / (autocvar_g_nades_nade_lifetime / 10);
- self.nextthink = time;
- if(!self.owner || wasfreed(self.owner))
- remove(self);
+void nade_timer_think(entity this)
+{
+ this.skin = 8 - (this.owner.wait - time) / (autocvar_g_nades_nade_lifetime / 10);
+ this.nextthink = time;
+ if(!this.owner || wasfreed(this.owner))
+ remove(this);
}
void nade_burn_spawn(entity _nade)
setattachment(timer, _nade, "");
timer.colormap = _nade.colormap;
timer.glowmod = _nade.glowmod;
- timer.think = nade_timer_think;
+ setthink(timer, nade_timer_think);
timer.nextthink = time;
timer.wait = _nade.wait;
timer.owner = _nade;
CSQCProjectile(_nade, true, Nades_from(_nade.nade_type).m_projectile[false], true);
}
-void napalm_damage(float dist, float damage, float edgedamage, float burntime)
-{SELFPARAM();
+void napalm_damage(entity this, float dist, float damage, float edgedamage, float burntime)
+{
entity e;
float d;
vector p;
return;
RandomSelection_Init();
- for(e = WarpZone_FindRadius(self.origin, dist, true); e; e = e.chain)
+ for(e = WarpZone_FindRadius(this.origin, dist, true); e; e = e.chain)
if(e.takedamage == DAMAGE_AIM)
- if(self.realowner != e || autocvar_g_nades_napalm_selfdamage)
- if(!IS_PLAYER(e) || !self.realowner || DIFF_TEAM(e, self))
+ if(this.realowner != e || autocvar_g_nades_napalm_selfdamage)
+ if(!IS_PLAYER(e) || !this.realowner || DIFF_TEAM(e, this))
if(!STAT(FROZEN, e))
{
p = e.origin;
p.x += e.mins.x + random() * (e.maxs.x - e.mins.x);
p.y += e.mins.y + random() * (e.maxs.y - e.mins.y);
p.z += e.mins.z + random() * (e.maxs.z - e.mins.z);
- d = vlen(WarpZone_UnTransformOrigin(e, self.origin) - p);
+ d = vlen(WarpZone_UnTransformOrigin(e, this.origin) - p);
if(d < dist)
{
e.fireball_impactvec = p;
}
if(RandomSelection_chosen_ent)
{
- d = vlen(WarpZone_UnTransformOrigin(RandomSelection_chosen_ent, self.origin) - RandomSelection_chosen_ent.fireball_impactvec);
+ d = vlen(WarpZone_UnTransformOrigin(RandomSelection_chosen_ent, this.origin) - RandomSelection_chosen_ent.fireball_impactvec);
d = damage + (edgedamage - damage) * (d / dist);
- Fire_AddDamage(RandomSelection_chosen_ent, self.realowner, d * burntime, burntime, self.projectiledeathtype | HITTYPE_BOUNCE);
- //trailparticles(self, particleeffectnum(EFFECT_FIREBALL_LASER), self.origin, RandomSelection_chosen_ent.fireball_impactvec);
- Send_Effect(EFFECT_FIREBALL_LASER, self.origin, RandomSelection_chosen_ent.fireball_impactvec - self.origin, 1);
+ Fire_AddDamage(RandomSelection_chosen_ent, this.realowner, d * burntime, burntime, this.projectiledeathtype | HITTYPE_BOUNCE);
+ //trailparticles(this, particleeffectnum(EFFECT_FIREBALL_LASER), this.origin, RandomSelection_chosen_ent.fireball_impactvec);
+ Send_Effect(EFFECT_FIREBALL_LASER, this.origin, RandomSelection_chosen_ent.fireball_impactvec - this.origin, 1);
}
}
-void napalm_ball_think()
-{SELFPARAM();
+void napalm_ball_think(entity this)
+{
if(round_handler_IsActive())
if(!round_handler_IsRoundStarted())
{
- remove(self);
+ remove(this);
return;
}
- if(time > self.pushltime)
+ if(time > this.pushltime)
{
- remove(self);
+ remove(this);
return;
}
- vector midpoint = ((self.absmin + self.absmax) * 0.5);
+ vector midpoint = ((this.absmin + this.absmax) * 0.5);
if(pointcontents(midpoint) == CONTENT_WATER)
{
- self.velocity = self.velocity * 0.5;
+ this.velocity = this.velocity * 0.5;
if(pointcontents(midpoint + '0 0 16') == CONTENT_WATER)
- { self.velocity_z = 200; }
+ { this.velocity_z = 200; }
}
- self.angles = vectoangles(self.velocity);
+ this.angles = vectoangles(this.velocity);
- napalm_damage(autocvar_g_nades_napalm_ball_radius,autocvar_g_nades_napalm_ball_damage,
+ napalm_damage(this, autocvar_g_nades_napalm_ball_radius,autocvar_g_nades_napalm_ball_damage,
autocvar_g_nades_napalm_ball_damage,autocvar_g_nades_napalm_burntime);
- self.nextthink = time + 0.1;
+ this.nextthink = time + 0.1;
}
-void nade_napalm_ball()
-{SELFPARAM();
+void nade_napalm_ball(entity this)
+{
entity proj;
vector kick;
- spamsound(self, CH_SHOTS, SND(FIREBALL_FIRE), VOL_BASE, ATTEN_NORM);
+ spamsound(this, CH_SHOTS, SND(FIREBALL_FIRE), VOL_BASE, ATTEN_NORM);
proj = new(grenade);
- proj.owner = self.owner;
- proj.realowner = self.realowner;
- proj.team = self.owner.team;
+ proj.owner = this.owner;
+ proj.realowner = this.realowner;
+ proj.team = this.owner.team;
proj.bot_dodge = true;
proj.bot_dodgerating = autocvar_g_nades_napalm_ball_damage;
proj.movetype = MOVETYPE_BOUNCE;
setmodel(proj, MDL_Null);
proj.scale = 1;//0.5;
setsize(proj, '-4 -4 -4', '4 4 4');
- setorigin(proj, self.origin);
- proj.think = napalm_ball_think;
+ setorigin(proj, this.origin);
+ setthink(proj, napalm_ball_think);
proj.nextthink = time;
proj.damageforcescale = autocvar_g_nades_napalm_ball_damageforcescale;
proj.effects = EF_LOWPRECISION | EF_FLAME;
}
-void napalm_fountain_think()
-{SELFPARAM();
+void napalm_fountain_think(entity this)
+{
if(round_handler_IsActive())
if(!round_handler_IsRoundStarted())
{
- remove(self);
+ remove(this);
return;
}
- if(time >= self.ltime)
+ if(time >= this.ltime)
{
- remove(self);
+ remove(this);
return;
}
- vector midpoint = ((self.absmin + self.absmax) * 0.5);
+ vector midpoint = ((this.absmin + this.absmax) * 0.5);
if(pointcontents(midpoint) == CONTENT_WATER)
{
- self.velocity = self.velocity * 0.5;
+ this.velocity = this.velocity * 0.5;
if(pointcontents(midpoint + '0 0 16') == CONTENT_WATER)
- { self.velocity_z = 200; }
+ { this.velocity_z = 200; }
- UpdateCSQCProjectile(self);
+ UpdateCSQCProjectile(this);
}
- napalm_damage(autocvar_g_nades_napalm_fountain_radius, autocvar_g_nades_napalm_fountain_damage,
+ napalm_damage(this, autocvar_g_nades_napalm_fountain_radius, autocvar_g_nades_napalm_fountain_damage,
autocvar_g_nades_napalm_fountain_edgedamage, autocvar_g_nades_napalm_burntime);
- self.nextthink = time + 0.1;
- if(time >= self.nade_special_time)
+ this.nextthink = time + 0.1;
+ if(time >= this.nade_special_time)
{
- self.nade_special_time = time + autocvar_g_nades_napalm_fountain_delay;
- nade_napalm_ball();
+ this.nade_special_time = time + autocvar_g_nades_napalm_fountain_delay;
+ nade_napalm_ball(this);
}
}
-void nade_napalm_boom()
-{SELFPARAM();
+void nade_napalm_boom(entity this)
+{
entity fountain;
int c;
for (c = 0; c < autocvar_g_nades_napalm_ball_count; c++)
- nade_napalm_ball();
+ nade_napalm_ball(this);
fountain = spawn();
fountain.realowner = self.realowner;
fountain.origin = self.origin;
setorigin(fountain, fountain.origin);
- fountain.think = napalm_fountain_think;
+ setthink(fountain, napalm_fountain_think);
fountain.nextthink = time;
fountain.ltime = time + autocvar_g_nades_napalm_fountain_lifetime;
fountain.pushltime = fountain.ltime;
Drop_Special_Items(frost_target);
}
-void nade_ice_think()
-{SELFPARAM();
+void nade_ice_think(entity this)
+{
if(round_handler_IsActive())
if(!round_handler_IsRoundStarted())
nade_ice_freeze(self, e, current_freeze_time);
}
-void nade_ice_boom()
-{SELFPARAM();
+void nade_ice_boom(entity this)
+{
entity fountain;
fountain = spawn();
- fountain.owner = self.owner;
- fountain.realowner = self.realowner;
- fountain.origin = self.origin;
+ fountain.owner = this.owner;
+ fountain.realowner = this.realowner;
+ fountain.origin = this.origin;
setorigin(fountain, fountain.origin);
- fountain.think = nade_ice_think;
+ setthink(fountain, nade_ice_think);
fountain.nextthink = time;
fountain.ltime = time + autocvar_g_nades_ice_freeze_time;
fountain.pushltime = fountain.wait = fountain.ltime;
- fountain.team = self.team;
+ fountain.team = this.team;
fountain.movetype = MOVETYPE_TOSS;
fountain.projectiledeathtype = DEATH_NADE_ICE.m_id;
fountain.bot_dodge = false;
setsize(fountain, '-16 -16 -16', '16 16 16');
fountain.nade_special_time = time+0.3;
- fountain.angles = self.angles;
+ fountain.angles = this.angles;
if ( autocvar_g_nades_ice_explode )
{
entity timer = new(nade_timer);
setmodel(timer, MDL_NADE_TIMER);
setattachment(timer, fountain, "");
- timer.colormap = self.colormap;
- timer.glowmod = self.glowmod;
- timer.think = nade_timer_think;
+ timer.colormap = this.colormap;
+ timer.glowmod = this.glowmod;
+ setthink(timer, nade_timer_think);
timer.nextthink = time;
timer.wait = fountain.ltime;
timer.owner = fountain;
setmodel(fountain, MDL_Null);
}
-void nade_translocate_boom()
-{SELFPARAM();
- if(self.realowner.vehicle)
+void nade_translocate_boom(entity this)
+{
+ if(this.realowner.vehicle)
return;
- vector locout = self.origin + '0 0 1' * (1 - self.realowner.mins.z - 24);
- tracebox(locout, self.realowner.mins, self.realowner.maxs, locout, MOVE_NOMONSTERS, self.realowner);
+ vector locout = this.origin + '0 0 1' * (1 - this.realowner.mins.z - 24);
+ tracebox(locout, this.realowner.mins, this.realowner.maxs, locout, MOVE_NOMONSTERS, this.realowner);
locout = trace_endpos;
- makevectors(self.realowner.angles);
+ makevectors(this.realowner.angles);
- MUTATOR_CALLHOOK(PortalTeleport, self.realowner);
+ MUTATOR_CALLHOOK(PortalTeleport, this.realowner);
- TeleportPlayer(self, self.realowner, locout, self.realowner.angles, v_forward * vlen(self.realowner.velocity), '0 0 0', '0 0 0', TELEPORT_FLAGS_TELEPORTER);
+ TeleportPlayer(this, this.realowner, locout, this.realowner.angles, v_forward * vlen(this.realowner.velocity), '0 0 0', '0 0 0', TELEPORT_FLAGS_TELEPORTER);
}
-void nade_spawn_boom()
-{SELFPARAM();
+void nade_spawn_boom(entity this)
+{
entity spawnloc = spawn();
- setorigin(spawnloc, self.origin);
- setsize(spawnloc, self.realowner.mins, self.realowner.maxs);
+ setorigin(spawnloc, this.origin);
+ setsize(spawnloc, this.realowner.mins, this.realowner.maxs);
spawnloc.movetype = MOVETYPE_NONE;
spawnloc.solid = SOLID_NOT;
- spawnloc.drawonlytoclient = self.realowner;
+ spawnloc.drawonlytoclient = this.realowner;
spawnloc.effects = EF_STARDUST;
spawnloc.cnt = autocvar_g_nades_spawn_count;
- if(self.realowner.nade_spawnloc)
+ if(this.realowner.nade_spawnloc)
{
- remove(self.realowner.nade_spawnloc);
- self.realowner.nade_spawnloc = world;
+ remove(this.realowner.nade_spawnloc);
+ this.realowner.nade_spawnloc = world;
}
- self.realowner.nade_spawnloc = spawnloc;
+ this.realowner.nade_spawnloc = spawnloc;
}
-void nade_heal_think()
-{SELFPARAM();
+void nade_heal_think(entity this)
+{
if(time >= self.ltime)
{
remove(self);
self.nade_show_particles = 0;
}
-void nade_heal_touch()
-{SELFPARAM();
+void nade_heal_touch(entity this)
+{
float maxhealth;
float health_factor;
if(IS_PLAYER(other) || IS_MONSTER(other))
}
}
-void nade_heal_boom()
-{SELFPARAM();
+void nade_heal_boom(entity this)
+{
entity healer;
healer = spawn();
- healer.owner = self.owner;
- healer.realowner = self.realowner;
- setorigin(healer, self.origin);
+ healer.owner = this.owner;
+ healer.realowner = this.realowner;
+ setorigin(healer, this.origin);
healer.healer_lifetime = autocvar_g_nades_heal_time; // save the cvar
healer.ltime = time + healer.healer_lifetime;
- healer.team = self.realowner.team;
+ healer.team = this.realowner.team;
healer.bot_dodge = false;
healer.solid = SOLID_TRIGGER;
- healer.touch = nade_heal_touch;
+ settouch(healer, nade_heal_touch);
setmodel(healer, MDL_NADE_HEAL);
healer.healer_radius = autocvar_g_nades_nade_radius;
Net_LinkEntity(healer, true, 0, healer_send);
- healer.think = nade_heal_think;
+ setthink(healer, nade_heal_think);
healer.nextthink = time;
healer.SendFlags |= 1;
}
-void nade_monster_boom()
-{SELFPARAM();
- entity e = spawnmonster(self.pokenade_type, 0, self.realowner, self.realowner, self.origin, false, false, 1);
+void nade_monster_boom(entity this)
+{
+ entity e = spawnmonster(this.pokenade_type, 0, this.realowner, this.realowner, this.origin, false, false, 1);
if(autocvar_g_nades_pokenade_monster_lifetime > 0)
e.monster_lifetime = time + autocvar_g_nades_pokenade_monster_lifetime;
e.monster_skill = MONSTER_SKILL_INSANE;
}
-void nade_boom()
-{SELFPARAM();
+void nade_boom(entity this)
+{
entity expef = NULL;
bool nade_blast = true;
- switch ( Nades_from(self.nade_type) )
+ switch ( Nades_from(this.nade_type) )
{
case NADE_TYPE_NAPALM:
nade_blast = autocvar_g_nades_napalm_blast;
case NADE_TYPE_MONSTER:
case NADE_TYPE_SPAWN:
nade_blast = false;
- switch(self.realowner.team)
+ switch(this.realowner.team)
{
case NUM_TEAM_1: expef = EFFECT_SPAWN_RED; break;
case NUM_TEAM_2: expef = EFFECT_SPAWN_BLUE; break;
default:
case NADE_TYPE_NORMAL:
- expef = EFFECT_NADE_EXPLODE(self.realowner.team);
+ expef = EFFECT_NADE_EXPLODE(this.realowner.team);
break;
}
if(expef)
- Send_Effect(expef, findbetterlocation(self.origin, 8), '0 0 0', 1);
+ Send_Effect(expef, findbetterlocation(this.origin, 8), '0 0 0', 1);
- sound(self, CH_SHOTS_SINGLE, SND_Null, VOL_BASE, ATTEN_NORM);
- sound(self, CH_SHOTS, SND_ROCKET_IMPACT, VOL_BASE, ATTEN_NORM);
+ sound(this, CH_SHOTS_SINGLE, SND_Null, VOL_BASE, ATTEN_NORM);
+ sound(this, CH_SHOTS, SND_ROCKET_IMPACT, VOL_BASE, ATTEN_NORM);
- self.event_damage = func_null; // prevent somehow calling damage in the next call
+ this.event_damage = func_null; // prevent somehow calling damage in the next call
if(nade_blast)
{
- RadiusDamage(self, self.realowner, autocvar_g_nades_nade_damage, autocvar_g_nades_nade_edgedamage,
- autocvar_g_nades_nade_radius, self, world, autocvar_g_nades_nade_force, self.projectiledeathtype, self.enemy);
- Damage_DamageInfo(self.origin, autocvar_g_nades_nade_damage, autocvar_g_nades_nade_edgedamage, autocvar_g_nades_nade_radius, '1 1 1' * autocvar_g_nades_nade_force, self.projectiledeathtype, 0, self);
+ RadiusDamage(this, this.realowner, autocvar_g_nades_nade_damage, autocvar_g_nades_nade_edgedamage,
+ autocvar_g_nades_nade_radius, this, world, autocvar_g_nades_nade_force, this.projectiledeathtype, this.enemy);
+ Damage_DamageInfo(this.origin, autocvar_g_nades_nade_damage, autocvar_g_nades_nade_edgedamage, autocvar_g_nades_nade_radius, '1 1 1' * autocvar_g_nades_nade_force, this.projectiledeathtype, 0, this);
}
- if(self.takedamage)
- switch ( Nades_from(self.nade_type) )
+ if(this.takedamage)
+ switch ( Nades_from(this.nade_type) )
{
- case NADE_TYPE_NAPALM: nade_napalm_boom(); break;
- case NADE_TYPE_ICE: nade_ice_boom(); break;
- case NADE_TYPE_TRANSLOCATE: nade_translocate_boom(); break;
- case NADE_TYPE_SPAWN: nade_spawn_boom(); break;
- case NADE_TYPE_HEAL: nade_heal_boom(); break;
- case NADE_TYPE_MONSTER: nade_monster_boom(); break;
+ case NADE_TYPE_NAPALM: nade_napalm_boom(this); break;
+ case NADE_TYPE_ICE: nade_ice_boom(this); break;
+ case NADE_TYPE_TRANSLOCATE: nade_translocate_boom(this); break;
+ case NADE_TYPE_SPAWN: nade_spawn_boom(this); break;
+ case NADE_TYPE_HEAL: nade_heal_boom(this); break;
+ case NADE_TYPE_MONSTER: nade_monster_boom(this); break;
}
- FOREACH_ENTITY_ENT(aiment, self,
+ FOREACH_ENTITY_ENT(aiment, this,
{
if(it.classname == "grapplinghook")
RemoveGrapplingHook(it.realowner);
});
- remove(self);
+ remove(this);
}
void spawn_held_nade(entity player, entity nowner, float ntime, int ntype, string pntype);
}
bool CanThrowNade(entity this);
-void nade_touch()
-{SELFPARAM();
+void nade_touch(entity this)
+{
if(other)
UpdateCSQCProjectile(self);
return;
}
- PROJECTILE_TOUCH;
+ PROJECTILE_TOUCH(this);
//setsize(self, '-2 -2 -2', '2 2 2');
//UpdateCSQCProjectile(self);
}
self.enemy = other;
- nade_boom();
+ nade_boom(self);
}
-void nade_beep()
-{SELFPARAM();
- sound(self, CH_SHOTS_SINGLE, SND_NADE_BEEP, VOL_BASE, 0.5 *(ATTEN_LARGE + ATTEN_MAX));
- self.think = nade_boom;
- self.nextthink = max(self.wait, time);
+void nade_beep(entity this)
+{
+ sound(this, CH_SHOTS_SINGLE, SND_NADE_BEEP, VOL_BASE, 0.5 *(ATTEN_LARGE + ATTEN_MAX));
+ setthink(this, nade_boom);
+ this.nextthink = max(this.wait, time);
}
void nade_damage(entity this, entity inflictor, entity attacker, float damage, int deathtype, vector hitloc, vector force)
if(ITEM_DAMAGE_NEEDKILL(deathtype))
{
this.takedamage = DAMAGE_NO;
- WITHSELF(this, nade_boom());
+ WITHSELF(this, nade_boom(this));
return;
}
{
sound(this, CH_SHOTS_SINGLE, SND_Null, VOL_BASE, 0.5 *(ATTEN_LARGE + ATTEN_MAX));
this.nextthink = max(time + autocvar_g_nades_nade_lifetime, time);
- this.think = nade_beep;
+ setthink(this, nade_beep);
}
this.health -= damage;
if(set_owner)
_nade.realowner = e;
- _nade.touch = nade_touch;
+ settouch(_nade, nade_touch);
_nade.spawnshieldtime = time + 0.1; // prevent instantly picking up again
_nade.health = autocvar_g_nades_nade_health;
_nade.max_health = _nade.health;
_nade.takedamage = DAMAGE_AIM;
_nade.event_damage = nade_damage;
- _nade.customizeentityforclient = func_null;
+ setcefc(_nade, func_null);
_nade.exteriormodeltoclient = world;
_nade.traileffectnum = 0;
_nade.teleportable = true;
if(_time)
{
- _nade.think = nade_boom;
+ setthink(_nade, nade_boom);
_nade.nextthink = _time;
}
MUTATOR_HOOKFUNCTION(nades, PutClientInServer)
{
- SELFPARAM();
- nades_RemoveBonus(self);
+ entity player = M_ARGV(0, entity);
+
+ nades_RemoveBonus(player);
}
-float nade_customize()
-{SELFPARAM();
+float nade_customize(entity this)
+{
//if(IS_SPEC(other)) { return false; }
if(other == self.exteriormodeltoclient || (IS_SPEC(other) && other.enemy == self.exteriormodeltoclient))
{
setmodel(n, MDL_PROJECTILE_NADE);
//setattachment(n, player, "bip01 l hand");
n.exteriormodeltoclient = player;
- n.customizeentityforclient = nade_customize;
+ setcefc(n, nade_customize);
n.traileffectnum = _particleeffectnum(Nade_TrailEffect(Nades_from(n.nade_type).m_projectile[false], player.team).eent_eff_name);
n.colormod = Nades_from(n.nade_type).m_color;
n.realowner = nowner;
n.glowmod = player.glowmod;
n.wait = time + max(0, ntime);
n.nade_time_primed = time;
- n.think = nade_beep;
+ setthink(n, nade_beep);
n.nextthink = max(n.wait - 3, time);
n.projectiledeathtype = DEATH_NADE.m_id;
fn.colormod = Nades_from(n.nade_type).m_color;
fn.colormap = player.colormap;
fn.glowmod = player.glowmod;
- fn.think = SUB_Remove_self;
+ setthink(fn, SUB_Remove);
fn.nextthink = n.wait;
player.nade = n;
}
MUTATOR_HOOKFUNCTION(nades, PlayerSpawn)
-{SELFPARAM();
+{
+ entity player = M_ARGV(0, entity);
+
if(autocvar_g_nades_spawn)
- self.nade_refire = time + autocvar_g_spawnshieldtime;
+ player.nade_refire = time + autocvar_g_spawnshieldtime;
else
- self.nade_refire = time + autocvar_g_nades_nade_refire;
+ player.nade_refire = time + autocvar_g_nades_nade_refire;
if(autocvar_g_nades_bonus_client_select)
- self.nade_type = self.cvar_cl_nade_type;
+ player.nade_type = player.cvar_cl_nade_type;
- self.nade_timer = 0;
+ player.nade_timer = 0;
- if (!self.offhand) self.offhand = OFFHAND_NADE;
+ if (!player.offhand) player.offhand = OFFHAND_NADE;
- if(self.nade_spawnloc)
+ if(player.nade_spawnloc)
{
- setorigin(self, self.nade_spawnloc.origin);
- self.nade_spawnloc.cnt -= 1;
+ setorigin(player, player.nade_spawnloc.origin);
+ player.nade_spawnloc.cnt -= 1;
- if(self.nade_spawnloc.cnt <= 0)
+ if(player.nade_spawnloc.cnt <= 0)
{
- remove(self.nade_spawnloc);
- self.nade_spawnloc = world;
+ remove(player.nade_spawnloc);
+ player.nade_spawnloc = world;
}
}
MUTATOR_HOOKFUNCTION(nades, PlayerDies, CBC_ORDER_LAST)
{
+ entity frag_attacker = M_ARGV(1, entity);
+ entity frag_target = M_ARGV(2, entity);
+
if(frag_target.nade)
if(!STAT(FROZEN, frag_target) || !autocvar_g_freezetag_revive_nade)
toss_nade(frag_target, true, '0 0 100', max(frag_target.nade.wait, time + 0.05));
}
nades_RemoveBonus(frag_target);
-
- return false;
}
MUTATOR_HOOKFUNCTION(nades, PlayerDamage_Calculate)
{
+ entity frag_inflictor = M_ARGV(0, entity);
+ entity frag_attacker = M_ARGV(1, entity);
+ entity frag_target = M_ARGV(2, entity);
+ float frag_deathtype = M_ARGV(3, float);
+
if(STAT(FROZEN, frag_target))
if(autocvar_g_freezetag_revive_nade)
if(frag_attacker == frag_target)
Unfreeze(frag_target);
frag_target.health = autocvar_g_freezetag_revive_nade_health;
Send_Effect(EFFECT_ICEORGLASS, frag_target.origin, '0 0 0', 3);
- frag_damage = 0;
- frag_force = '0 0 0';
+ M_ARGV(4, float) = 0;
+ M_ARGV(6, vector) = '0 0 0';
Send_Notification(NOTIF_ALL, world, MSG_INFO, INFO_FREEZETAG_REVIVED_NADE, frag_target.netname);
Send_Notification(NOTIF_ONE, frag_target, MSG_CENTER, CENTER_FREEZETAG_REVIVE_SELF);
}
MUTATOR_HOOKFUNCTION(nades, MonsterDies)
{
+ entity frag_target = M_ARGV(0, entity);
+ entity frag_attacker = M_ARGV(1, entity);
+
if(IS_PLAYER(frag_attacker))
if(DIFF_TEAM(frag_attacker, frag_target))
if(!(frag_target.spawnflags & MONSTERFLAG_SPAWNED))
MUTATOR_HOOKFUNCTION(nades, DropSpecialItems)
{
+ entity frag_target = M_ARGV(0, entity);
+
if(frag_target.nade)
toss_nade(frag_target, true, '0 0 0', time + 0.05);
projects / xonotic / xonotic-data.pk3dir.git / blobdiff