#include "mutators/all.qh"
#include "scores.qh"
#include "spawnpoints.qh"
-#include "t_items.qh"
+#include "../common/state.qh"
+#include "../common/physics/player.qh"
+#include "../common/t_items.qh"
#include "../common/vehicles/all.qh"
#include "../common/items/all.qc"
#include "../common/mutators/mutator/waypoints/waypointsprites.qh"
#include "weapons/selection.qh"
#include "../common/constants.qh"
#include "../common/deathtypes/all.qh"
-#include "../common/notifications.qh"
-#include "../common/movetypes/movetypes.qh"
+#include "../common/notifications/all.qh"
+#include "../common/physics/movetypes/movetypes.qh"
#include "../common/playerstats.qh"
#include "../common/teams.qh"
#include "../common/util.qh"
}
void GiveFrags (entity attacker, entity targ, float f, int deathtype)
-{SELFPARAM();
+{
// TODO route through PlayerScores instead
if(gameover) return;
{
// after a frag, exchange the current weapon (or the culprit, if detectable) by a new random weapon
Weapon culprit = DEATH_WEAPONOF(deathtype);
- if(!culprit) culprit = Weapons_from(attacker.weapon);
- else if(!(attacker.weapons & (culprit.m_wepset))) culprit = Weapons_from(attacker.weapon);
+ if(!culprit) culprit = PS(attacker).m_weapon;
+ else if(!(attacker.weapons & (culprit.m_wepset))) culprit = PS(attacker).m_weapon;
if(g_weaponarena_random_with_blaster && culprit == WEP_BLASTER) // WEAPONTODO: Shouldn't this be in a mutator?
{
}
// after a frag, choose another random weapon set
- if (!(attacker.weapons & WepSet_FromWeapon(Weapons_from(attacker.weapon))))
+ if (!(attacker.weapons & WepSet_FromWeapon(PS(attacker).m_weapon)))
W_SwitchWeapon_Force(attacker, w_getbestweapon(attacker));
}
// FIXME fix the mess this is (we have REAL points now!)
- if(MUTATOR_CALLHOOK(GiveFragsForKill, self, attacker, targ, f))
- {
- f = frag_score;
- }
+ if(MUTATOR_CALLHOOK(GiveFragsForKill, attacker, targ, f))
+ f = M_ARGV(2, float);
attacker.totalfrags += f;
string AppendItemcodes(string s, entity player)
{
- float w;
- w = player.weapon;
+ int w = PS(player).m_weapon.m_id;
//if(w == 0)
// w = player.switchweapon;
if(w == 0)
s = strcat(s, "S");
if(time < player.invincible_finished)
s = strcat(s, "I");
- if(player.flagcarried != world)
+ if(player.flagcarried != NULL)
s = strcat(s, "F");
- if(player.BUTTON_CHAT)
+ if(PHYS_INPUT_BUTTON_CHAT(player))
s = strcat(s, "T");
if(player.kh_next)
s = strcat(s, "K");
entity deathent = Deathtypes_from(deathtype - DT_FIRST);
if (!deathent) { backtrace("Obituary_SpecialDeath: Could not find deathtype entity!\n"); return; }
+ if(g_cts && deathtype == DEATH_KILL.m_id)
+ return; // TODO: somehow put this in CTS gamemode file!
+
if(murder)
{
if(deathent.death_msgmurder)
NOTIF_ONE,
notif_target,
MSG_MULTI,
- deathent.death_msgmurder.nent_id,
+ deathent.death_msgmurder,
s1, s2, s3, "",
f1, f2, f3, 0
);
NOTIF_ALL_EXCEPT,
notif_target,
MSG_INFO,
- deathent.death_msgmurder.nent_msginfo.nent_id,
+ deathent.death_msgmurder.nent_msginfo,
s1, s2, s3, "",
f1, f2, f3, 0
);
NOTIF_ONE,
notif_target,
MSG_MULTI,
- deathent.death_msgself.nent_id,
+ deathent.death_msgself,
s1, s2, s3, "",
f1, f2, f3, 0
);
NOTIF_ALL_EXCEPT,
notif_target,
MSG_INFO,
- deathent.death_msgself.nent_msginfo.nent_id,
+ deathent.death_msgself.nent_msginfo,
s1, s2, s3, "",
f1, f2, f3, 0
);
if (death_weapon != WEP_Null)
{
w_deathtype = deathtype;
- int death_message = ((murder) ? death_weapon.wr_killmessage(death_weapon) : death_weapon.wr_suicidemessage(death_weapon));
+ Notification death_message = ((murder) ? death_weapon.wr_killmessage(death_weapon) : death_weapon.wr_suicidemessage(death_weapon));
w_deathtype = false;
if (death_message)
s1, s2, s3, "",
f1, f2, 0, 0
);
+ // send the info part to everyone
Send_Notification_WOCOVA(
NOTIF_ALL_EXCEPT,
notif_target,
MSG_INFO,
- msg_multi_notifs[death_message - 1].nent_msginfo.nent_id,
+ death_message.nent_msginfo,
s1, s2, s3, "",
f1, f2, 0, 0
);
}
.int buffs = _STAT(BUFFS); // TODO: remove
-
+entity buff_FirstFromFlags(int _buffs);
void Obituary(entity attacker, entity inflictor, entity targ, int deathtype)
{
// Sanity check
return;
}
LogDeath("suicide", deathtype, targ, targ);
- GiveFrags(attacker, targ, -1, deathtype);
+ if(deathtype != DEATH_AUTOTEAMCHANGE.m_id) // special case: don't negate frags if auto switched
+ GiveFrags(attacker, targ, -1, deathtype);
}
// ======
Send_Notification(NOTIF_ONE, attacker, MSG_CENTER, CENTER_DEATH_TEAMKILL_FRAG, targ.netname);
Send_Notification(NOTIF_ONE, targ, MSG_CENTER, CENTER_DEATH_TEAMKILL_FRAGGED, attacker.netname);
- Send_Notification(NOTIF_ALL, world, MSG_INFO, APP_TEAM_NUM_4(targ.team, INFO_DEATH_TEAMKILL_), targ.netname, attacker.netname, deathlocation, targ.killcount);
+ Send_Notification(NOTIF_ALL, NULL, MSG_INFO, APP_TEAM_NUM(targ.team, INFO_DEATH_TEAMKILL), targ.netname, attacker.netname, deathlocation, targ.killcount);
// In this case, the death message will ALWAYS be "foo was betrayed by bar"
// No need for specific death/weapon messages...
CHOICE_TYPEFRAG,
targ.netname,
kill_count_to_attacker,
- (IS_BOT_CLIENT(targ) ? NO_MSG : targ.ping)
+ (IS_BOT_CLIENT(targ) ? -1 : targ.ping)
);
Send_Notification(
NOTIF_ONE,
kill_count_to_target,
attacker.health,
attacker.armorvalue,
- (IS_BOT_CLIENT(attacker) ? NO_MSG : attacker.ping)
+ (IS_BOT_CLIENT(attacker) ? -1 : attacker.ping)
);
}
else
CHOICE_FRAG,
targ.netname,
kill_count_to_attacker,
- (IS_BOT_CLIENT(targ) ? NO_MSG : targ.ping)
+ (IS_BOT_CLIENT(targ) ? -1 : targ.ping)
);
Send_Notification(
NOTIF_ONE,
kill_count_to_target,
attacker.health,
attacker.armorvalue,
- (IS_BOT_CLIENT(attacker) ? NO_MSG : attacker.ping)
+ (IS_BOT_CLIENT(attacker) ? -1 : attacker.ping)
);
}
- float f3 = 0;
+ int f3 = 0;
if(deathtype == DEATH_BUFF.m_id)
- f3 = attacker.buffs;
+ f3 = buff_FirstFromFlags(attacker.buffs).m_id;
if (!Obituary_WeaponDeath(targ, true, deathtype, targ.netname, attacker.netname, deathlocation, targ.killcount, kill_count_to_attacker))
Obituary_SpecialDeath(targ, true, deathtype, targ.netname, attacker.netname, deathlocation, targ.killcount, kill_count_to_attacker, f3);
if(targ.killcount) { targ.killcount = 0; }
}
-void Ice_Think()
-{SELFPARAM();
- if(!self.owner.frozen || self.owner.iceblock != self)
+void Ice_Think(entity this)
+{
+ if(!STAT(FROZEN, this.owner) || this.owner.iceblock != this)
{
- remove(self);
+ remove(this);
return;
}
- setorigin(self, self.owner.origin - '0 0 16');
- self.nextthink = time;
+ setorigin(this, this.owner.origin - '0 0 16');
+ this.nextthink = time;
}
void Freeze (entity targ, float freeze_time, float frozen_type, float show_waypoint)
-{SELFPARAM();
+{
if(!IS_PLAYER(targ) && !IS_MONSTER(targ)) // only specified entities can be freezed
return;
- if(targ.frozen)
+ if(STAT(FROZEN, targ))
return;
float targ_maxhealth = ((IS_MONSTER(targ)) ? targ.max_health : start_health);
- targ.frozen = frozen_type;
+ STAT(FROZEN, targ) = frozen_type;
targ.revive_progress = ((frozen_type == 3) ? 1 : 0);
targ.health = ((frozen_type == 3) ? targ_maxhealth : 1);
targ.revive_speed = freeze_time;
- self.bot_attack = false;
+ targ.bot_attack = false;
entity ice = new(ice);
ice.owner = targ;
ice.scale = targ.scale;
- ice.think = Ice_Think;
+ setthink(ice, Ice_Think);
ice.nextthink = time;
ice.frame = floor(random() * 21); // ice model has 20 different looking frames
setmodel(ice, MDL_ICE);
targ.iceblock = ice;
targ.revival_time = 0;
- WITH(entity, self, ice, Ice_Think());
+ Ice_Think(ice);
RemoveGrapplingHook(targ);
- entity head;
- FOR_EACH_PLAYER(head)
- if(head.hook.aiment == targ)
- RemoveGrapplingHook(head);
+ FOREACH_CLIENT(IS_PLAYER(it) && it.hook.aiment == targ, LAMBDA(RemoveGrapplingHook(it)));
// add waypoint
if(show_waypoint)
- WaypointSprite_Spawn(WP_Frozen, 0, 0, targ, '0 0 64', world, targ.team, targ, waypointsprite_attached, true, RADARICON_WAYPOINT);
+ WaypointSprite_Spawn(WP_Frozen, 0, 0, targ, '0 0 64', NULL, targ.team, targ, waypointsprite_attached, true, RADARICON_WAYPOINT);
}
void Unfreeze (entity targ)
{
- if(!targ.frozen)
+ if(!STAT(FROZEN, targ))
return;
- if(targ.frozen && targ.frozen != 3) // only reset health if target was frozen
+ if(STAT(FROZEN, targ) && STAT(FROZEN, targ) != 3) // only reset health if target was frozen
targ.health = ((IS_PLAYER(targ)) ? start_health : targ.max_health);
- entity head;
- targ.frozen = 0;
+ STAT(FROZEN, targ) = 0;
targ.revive_progress = 0;
targ.revival_time = time;
- self.bot_attack = true;
+ targ.bot_attack = true;
WaypointSprite_Kill(targ.waypointsprite_attached);
- FOR_EACH_PLAYER(head)
- if(head.hook.aiment == targ)
- RemoveGrapplingHook(head);
+ FOREACH_CLIENT(IS_PLAYER(it) && it.hook.aiment == targ, LAMBDA(RemoveGrapplingHook(it)));
// remove the ice block
if(targ.iceblock)
remove(targ.iceblock);
- targ.iceblock = world;
+ targ.iceblock = NULL;
}
void Damage (entity targ, entity inflictor, entity attacker, float damage, int deathtype, vector hitloc, vector force)
-{SELFPARAM();
+{
float mirrordamage;
float mirrorforce;
float complainteamdamage = 0;
if (gameover || targ.killcount == FRAGS_SPECTATOR)
return;
- setself(targ);
- damage_targ = targ;
- damage_inflictor = inflictor;
- damage_attacker = attacker;
- attacker_save = attacker;
+ damage_targ = targ;
+ damage_inflictor = inflictor;
+ damage_attacker = attacker;
+ attacker_save = attacker;
if(IS_PLAYER(targ))
if(targ.hook)
// special rule: gravity bomb does not hit team mates (other than for disconnecting the hook)
if(DEATH_ISWEAPON(deathtype, WEP_HOOK) || DEATH_ISWEAPON(deathtype, WEP_TUBA))
{
- if(IS_PLAYER(targ))
- if(SAME_TEAM(targ, attacker))
- {
- setself(this);
- return;
- }
+ if(IS_PLAYER(targ) && SAME_TEAM(targ, attacker))
+ {
+ return;
+ }
}
if(deathtype == DEATH_KILL.m_id || deathtype == DEATH_TEAMCHANGE.m_id || deathtype == DEATH_AUTOTEAMCHANGE.m_id)
{
// exit the vehicle before killing (fixes a crash)
if(IS_PLAYER(targ) && targ.vehicle)
- vehicles_exit(VHEF_RELEASE);
+ vehicles_exit(targ.vehicle, VHEF_RELEASE);
// These are ALWAYS lethal
// No damage modification here
damage = 0;
else if(autocvar_teamplay_mode == 4)
{
- if(IS_PLAYER(targ) && targ.deadflag == DEAD_NO)
+ if(IS_PLAYER(targ) && !IS_DEAD(targ))
{
attacker.dmg_team = attacker.dmg_team + damage;
complainteamdamage = attacker.dmg_team - autocvar_g_teamdamage_threshold;
// should this be changed at all? If so, in what way?
MUTATOR_CALLHOOK(PlayerDamage_Calculate, inflictor, attacker, targ, deathtype, damage, mirrordamage, force);
- damage = frag_damage;
- mirrordamage = frag_mirrordamage;
- force = frag_force;
+ damage = M_ARGV(4, float);
+ mirrordamage = M_ARGV(5, float);
+ force = M_ARGV(6, vector);
- if(targ.frozen)
+ if(STAT(FROZEN, targ))
if(deathtype != DEATH_HURTTRIGGER.m_id && deathtype != DEATH_TEAMCHANGE.m_id && deathtype != DEATH_AUTOTEAMCHANGE.m_id)
{
if(autocvar_g_frozen_revive_falldamage > 0)
Unfreeze(targ);
targ.health = autocvar_g_frozen_revive_falldamage_health;
Send_Effect(EFFECT_ICEORGLASS, targ.origin, '0 0 0', 3);
- Send_Notification(NOTIF_ALL, world, MSG_INFO, INFO_FREEZETAG_REVIVED_FALL, targ.netname);
+ Send_Notification(NOTIF_ALL, NULL, MSG_INFO, INFO_FREEZETAG_REVIVED_FALL, targ.netname);
Send_Notification(NOTIF_ONE, targ, MSG_CENTER, CENTER_FREEZETAG_REVIVE_SELF);
}
force *= autocvar_g_frozen_force;
}
- if(targ.frozen && deathtype == DEATH_HURTTRIGGER.m_id && !autocvar_g_frozen_damage_trigger)
+ if(STAT(FROZEN, targ) && deathtype == DEATH_HURTTRIGGER.m_id && !autocvar_g_frozen_damage_trigger)
{
Send_Effect(EFFECT_TELEPORT, targ.origin, '0 0 0', 1);
- setself(targ);
- entity spot = SelectSpawnPoint (false);
+ entity spot = SelectSpawnPoint (targ, false);
if(spot)
{
damage = 0;
- self.deadflag = DEAD_NO;
+ targ.deadflag = DEAD_NO;
- self.angles = spot.angles;
+ targ.angles = spot.angles;
- self.effects = 0;
- self.effects |= EF_TELEPORT_BIT;
+ targ.effects = 0;
+ targ.effects |= EF_TELEPORT_BIT;
- self.angles_z = 0; // never spawn tilted even if the spot says to
- self.fixangle = true; // turn this way immediately
- self.velocity = '0 0 0';
- self.avelocity = '0 0 0';
- self.punchangle = '0 0 0';
- self.punchvector = '0 0 0';
- self.oldvelocity = self.velocity;
+ targ.angles_z = 0; // never spawn tilted even if the spot says to
+ targ.fixangle = true; // turn this way immediately
+ targ.velocity = '0 0 0';
+ targ.avelocity = '0 0 0';
+ targ.punchangle = '0 0 0';
+ targ.punchvector = '0 0 0';
+ targ.oldvelocity = targ.velocity;
- self.spawnorigin = spot.origin;
- setorigin (self, spot.origin + '0 0 1' * (1 - self.mins.z - 24));
+ targ.spawnorigin = spot.origin;
+ setorigin(targ, spot.origin + '0 0 1' * (1 - targ.mins.z - 24));
// don't reset back to last position, even if new position is stuck in solid
- self.oldorigin = self.origin;
- self.prevorigin = self.origin;
+ targ.oldorigin = targ.origin;
+ targ.prevorigin = targ.origin;
- Send_Effect(EFFECT_TELEPORT, self.origin, '0 0 0', 1);
+ Send_Effect(EFFECT_TELEPORT, targ.origin, '0 0 0', 1);
}
-
- setself(this);
}
if(!g_instagib)
// count the damage
if(attacker)
- if(!targ.deadflag)
+ if(!IS_DEAD(targ))
if(deathtype != DEATH_BUFF.m_id)
if(targ.takedamage == DAMAGE_AIM)
if(targ != attacker)
if(IS_PLAYER(victim) || (IS_TURRET(victim) && victim.active == ACTIVE_ACTIVE) || IS_MONSTER(victim) || MUTATOR_CALLHOOK(PlayHitsound, victim))
{
- if(DIFF_TEAM(victim, attacker) && !victim.frozen)
+ if(DIFF_TEAM(victim, attacker) && !STAT(FROZEN, victim))
{
if(damage > 0)
{
if(deathtype != DEATH_FIRE.m_id)
{
- if(victim.BUTTON_CHAT)
+ if(PHYS_INPUT_BUTTON_CHAT(victim))
attacker.typehitsound += 1;
else
attacker.damage_dealt += damage;
}
// apply push
- if (self.damageforcescale)
+ if (targ.damageforcescale)
if (vlen(force))
- if (!IS_PLAYER(self) || time >= self.spawnshieldtime || self == attacker)
+ if (!IS_PLAYER(targ) || time >= targ.spawnshieldtime || targ == attacker)
{
- vector farce = damage_explosion_calcpush(self.damageforcescale * force, self.velocity, autocvar_g_balance_damagepush_speedfactor);
- if(self.movetype == MOVETYPE_PHYSICS)
+ vector farce = damage_explosion_calcpush(targ.damageforcescale * force, targ.velocity, autocvar_g_balance_damagepush_speedfactor);
+ if(targ.movetype == MOVETYPE_PHYSICS)
{
entity farcent = new(farce);
- farcent.enemy = self;
+ farcent.enemy = targ;
farcent.movedir = farce * 10;
- if(self.mass)
- farcent.movedir = farcent.movedir * self.mass;
+ if(targ.mass)
+ farcent.movedir = farcent.movedir * targ.mass;
farcent.origin = hitloc;
farcent.forcetype = FORCETYPE_FORCEATPOS;
farcent.nextthink = time + 0.1;
- farcent.think = SUB_Remove_self;
+ setthink(farcent, SUB_Remove);
}
else
{
- self.velocity = self.velocity + farce;
- self.move_velocity = self.velocity;
+ targ.velocity = targ.velocity + farce;
}
- self.flags &= ~FL_ONGROUND;
- self.move_flags &= ~FL_ONGROUND;
- UpdateCSQCProjectile(self);
+ UNSET_ONGROUND(targ);
+ UpdateCSQCProjectile(targ);
}
// apply damage
- if (damage != 0 || (self.damageforcescale && vlen(force)))
- if (self.event_damage)
- self.event_damage (inflictor, attacker, damage, deathtype, hitloc, force);
- setself(this);
+ if (damage != 0 || (targ.damageforcescale && vlen(force)))
+ if (targ.event_damage)
+ targ.event_damage (targ, inflictor, attacker, damage, deathtype, hitloc, force);
// apply mirror damage if any
+ if(!autocvar_g_mirrordamage_onlyweapons || DEATH_WEAPONOF(deathtype) != WEP_Null)
if(mirrordamage > 0 || mirrorforce > 0)
{
attacker = attacker_save;
if(DEATH_WEAPONOF(deathtype) != WEP_TUBA) // do not send tuba damage (bandwidth hog)
{
force = inflictorvelocity;
- if(vlen(force) == 0)
+ if(force == '0 0 0')
force = '0 0 -1';
else
force = normalize(force);
if(IS_PLAYER(e))
{
- if(e.deadflag)
+ if(IS_DEAD(e))
return -1;
}
else
{
// print("adding a fire burner to ", e.classname, "\n");
e.fire_burner = new(fireburner);
- e.fire_burner.think = fireburner_think;
+ setthink(e.fire_burner, fireburner_think);
e.fire_burner.nextthink = time;
e.fire_burner.owner = e;
}
e.fire_endtime = 0;
// ice stops fire
- if(e.frozen)
+ if(STAT(FROZEN, e))
e.fire_endtime = 0;
t = min(frametime, e.fire_endtime - time);
}
e.fire_hitsound = true;
- if (!IS_INDEPENDENT_PLAYER(e))
- if(!e.frozen)
- FOR_EACH_PLAYER(other) if(e != other)
- {
- if(IS_PLAYER(other))
- if(other.deadflag == DEAD_NO)
- if (!IS_INDEPENDENT_PLAYER(other))
- if(boxesoverlap(e.absmin, e.absmax, other.absmin, other.absmax))
- {
- t = autocvar_g_balance_firetransfer_time * (e.fire_endtime - time);
- d = autocvar_g_balance_firetransfer_damage * e.fire_damagepersec * t;
- Fire_AddDamage(other, o, d, t, DEATH_FIRE.m_id);
- }
- }
+ if(!IS_INDEPENDENT_PLAYER(e))
+ if(!STAT(FROZEN, e))
+ FOREACH_CLIENT(IS_PLAYER(it) && it != e, LAMBDA(
+ if(!IS_DEAD(it))
+ if(!IS_INDEPENDENT_PLAYER(it))
+ if(boxesoverlap(e.absmin, e.absmax, it.absmin, it.absmax))
+ {
+ t = autocvar_g_balance_firetransfer_time * (e.fire_endtime - time);
+ d = autocvar_g_balance_firetransfer_damage * e.fire_damagepersec * t;
+ Fire_AddDamage(it, o, d, t, DEATH_FIRE.m_id);
+ }
+ ));
}
void Fire_ApplyEffect(entity e)
e.effects &= ~EF_FLAME;
}
-void fireburner_think()
-{SELFPARAM();
+void fireburner_think(entity this)
+{
// for players, this is done in the regular loop
- if(wasfreed(self.owner))
+ if(wasfreed(this.owner))
{
- remove(self);
+ remove(this);
return;
}
- Fire_ApplyEffect(self.owner);
- if(!Fire_IsBurning(self.owner))
+ Fire_ApplyEffect(this.owner);
+ if(!Fire_IsBurning(this.owner))
{
- self.owner.fire_burner = world;
- remove(self);
+ this.owner.fire_burner = NULL;
+ remove(this);
return;
}
- Fire_ApplyDamage(self.owner);
- self.nextthink = time;
+ Fire_ApplyDamage(this.owner);
+ this.nextthink = time;
}
projects / xonotic / xonotic-data.pk3dir.git / blobdiff