X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fserver%2Fg_damage.qc;h=dad52d685f5f3e3f4ed6cd47a73748254425692e;hp=2cc773b73f526b53a46b927692be1ba1069d9970;hb=61bd69dc7a8e218b6beff349fd332eb7ac8a81ae;hpb=2d29a97f94a5b28bee1a909ba5e47abf352ac751 diff --git a/qcsrc/server/g_damage.qc b/qcsrc/server/g_damage.qc index 2cc773b73..dad52d685 100644 --- a/qcsrc/server/g_damage.qc +++ b/qcsrc/server/g_damage.qc @@ -1,67 +1,31 @@ #include "g_damage.qh" -#include "_all.qh" +#include "bot/bot.qh" #include "g_hook.qh" -#include "mutators/mutators_include.qh" +#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/accuracy.qh" #include "weapons/csqcprojectile.qh" #include "weapons/selection.qh" -#include "../common/buffs.qh" #include "../common/constants.qh" -#include "../common/deathtypes.qh" -#include "../common/notifications.qh" -#include "../common/movetypes/movetypes.qh" +#include "../common/deathtypes/all.qh" +#include "../common/notifications/all.qh" +#include "../common/physics/movetypes/movetypes.qh" #include "../common/playerstats.qh" #include "../common/teams.qh" #include "../common/util.qh" #include "../common/weapons/all.qh" -#include "../csqcmodellib/sv_model.qh" -#include "../warpzonelib/common.qh" +#include "../lib/csqcmodel/sv_model.qh" +#include "../lib/warpzone/common.qh" -float Damage_DamageInfo_SendEntity(entity to, int sf) -{SELFPARAM(); - WriteByte(MSG_ENTITY, ENT_CLIENT_DAMAGEINFO); - WriteShort(MSG_ENTITY, self.projectiledeathtype); - WriteCoord(MSG_ENTITY, floor(self.origin.x)); - WriteCoord(MSG_ENTITY, floor(self.origin.y)); - WriteCoord(MSG_ENTITY, floor(self.origin.z)); - WriteByte(MSG_ENTITY, bound(1, self.dmg, 255)); - WriteByte(MSG_ENTITY, bound(0, self.dmg_radius, 255)); - WriteByte(MSG_ENTITY, bound(1, self.dmg_edge, 255)); - WriteShort(MSG_ENTITY, self.oldorigin.x); - WriteByte(MSG_ENTITY, self.species); - return true; -} - -void Damage_DamageInfo(vector org, float coredamage, float edgedamage, float rad, vector force, int deathtype, float bloodtype, entity dmgowner) -{ - // TODO maybe call this from non-edgedamage too? - // TODO maybe make the client do the particle effects for the weapons and the impact sounds using this info? - - entity e; - - if(!sound_allowed(MSG_BROADCAST, dmgowner)) - deathtype |= 0x8000; - - e = spawn(); - setorigin(e, org); - e.projectiledeathtype = deathtype; - e.dmg = coredamage; - e.dmg_edge = edgedamage; - e.dmg_radius = rad; - e.dmg_force = vlen(force); - e.velocity = force; - e.oldorigin_x = compressShortVector(e.velocity); - e.species = bloodtype; - - Net_LinkEntity(e, false, 0.2, Damage_DamageInfo_SendEntity); -} - -void UpdateFrags(entity player, float f) +void UpdateFrags(entity player, int f) { PlayerTeamScore_AddScore(player, f); } @@ -98,14 +62,11 @@ void GiveFrags (entity attacker, entity targ, float f, int deathtype) if(g_weaponarena_random) { // after a frag, exchange the current weapon (or the culprit, if detectable) by a new random weapon - float culprit; - culprit = DEATH_WEAPONOF(deathtype); - if(!culprit) - culprit = attacker.weapon; - else if(!(attacker.weapons & WepSet_FromWeapon(culprit))) - culprit = attacker.weapon; - - if(g_weaponarena_random_with_blaster && culprit == WEP_BLASTER.m_id) // WEAPONTODO: Shouldn't this be in a mutator? + Weapon culprit = DEATH_WEAPONOF(deathtype); + 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? { // no exchange } @@ -113,8 +74,7 @@ void GiveFrags (entity attacker, entity targ, float f, int deathtype) { if(!GiveFrags_randomweapons) { - GiveFrags_randomweapons = spawn(); - GiveFrags_randomweapons.classname = "GiveFrags_randomweapons"; + GiveFrags_randomweapons = new(GiveFrags_randomweapons); } if(warmup_stage) @@ -124,7 +84,7 @@ void GiveFrags (entity attacker, entity targ, float f, int deathtype) // all others (including the culprit): remove GiveFrags_randomweapons.weapons &= ~attacker.weapons; - GiveFrags_randomweapons.weapons &= ~WepSet_FromWeapon(culprit); + GiveFrags_randomweapons.weapons &= ~(culprit.m_wepset); // among the remaining ones, choose one by random W_RandomWeapons(GiveFrags_randomweapons, 1); @@ -132,12 +92,12 @@ void GiveFrags (entity attacker, entity targ, float f, int deathtype) if(GiveFrags_randomweapons.weapons) { attacker.weapons |= GiveFrags_randomweapons.weapons; - attacker.weapons &= ~WepSet_FromWeapon(culprit); + attacker.weapons &= ~(culprit.m_wepset); } } // after a frag, choose another random weapon set - if (!(attacker.weapons & WepSet_FromWeapon(attacker.weapon))) + if (!(attacker.weapons & WepSet_FromWeapon(PS(attacker).m_weapon))) W_SwitchWeapon_Force(attacker, w_getbestweapon(attacker)); } @@ -155,8 +115,7 @@ void GiveFrags (entity attacker, entity targ, float f, int deathtype) 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) @@ -168,7 +127,7 @@ string AppendItemcodes(string s, entity player) s = strcat(s, "I"); if(player.flagcarried != world) 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"); @@ -203,9 +162,12 @@ void Obituary_SpecialDeath( { if(DEATH_ISSPECIAL(deathtype)) { - entity deathent = deathtypes[(deathtype - DT_FIRST)]; + 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) @@ -214,7 +176,7 @@ void Obituary_SpecialDeath( NOTIF_ONE, notif_target, MSG_MULTI, - deathent.death_msgmurder.nent_id, + deathent.death_msgmurder, s1, s2, s3, "", f1, f2, f3, 0 ); @@ -222,7 +184,7 @@ void Obituary_SpecialDeath( 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 ); @@ -236,7 +198,7 @@ void Obituary_SpecialDeath( NOTIF_ONE, notif_target, MSG_MULTI, - deathent.death_msgself.nent_id, + deathent.death_msgself, s1, s2, s3, "", f1, f2, f3, 0 ); @@ -244,7 +206,7 @@ void Obituary_SpecialDeath( 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 ); @@ -261,11 +223,11 @@ float Obituary_WeaponDeath( string s1, string s2, string s3, float f1, float f2) { - float death_weapon = DEATH_WEAPONOF(deathtype); - if(death_weapon) + Weapon death_weapon = DEATH_WEAPONOF(deathtype); + if (death_weapon != WEP_Null) { w_deathtype = deathtype; - int death_message = WEP_ACTION(death_weapon, ((murder) ? WR_KILLMESSAGE : WR_SUICIDEMESSAGE)); + Notification death_message = ((murder) ? death_weapon.wr_killmessage(death_weapon) : death_weapon.wr_suicidemessage(death_weapon)); w_deathtype = false; if (death_message) @@ -278,11 +240,12 @@ float Obituary_WeaponDeath( 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 ); @@ -301,6 +264,8 @@ float Obituary_WeaponDeath( return false; } +.int buffs = _STAT(BUFFS); // TODO: remove +entity buff_FirstFromFlags(int _buffs); void Obituary(entity attacker, entity inflictor, entity targ, int deathtype) { // Sanity check @@ -335,13 +300,13 @@ void Obituary(entity attacker, entity inflictor, entity targ, int deathtype) { if(DEATH_ISSPECIAL(deathtype)) { - if(deathtype == DEATH_TEAMCHANGE || deathtype == DEATH_AUTOTEAMCHANGE) + if(deathtype == DEATH_TEAMCHANGE.m_id || deathtype == DEATH_AUTOTEAMCHANGE.m_id) { Obituary_SpecialDeath(targ, false, deathtype, targ.netname, deathlocation, "", targ.team, 0, 0); } else { - switch(deathtype) + switch(DEATH_ENT(deathtype)) { case DEATH_MIRRORDAMAGE: { @@ -380,7 +345,7 @@ void Obituary(entity attacker, entity inflictor, entity targ, int 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, world, 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... @@ -433,7 +398,7 @@ void Obituary(entity attacker, entity inflictor, entity targ, int deathtype) 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, @@ -444,7 +409,7 @@ void Obituary(entity attacker, entity inflictor, entity targ, int deathtype) kill_count_to_target, attacker.health, attacker.armorvalue, - (IS_BOT_CLIENT(attacker) ? NO_MSG : attacker.ping) + (IS_BOT_CLIENT(attacker) ? -1 : attacker.ping) ); } else @@ -456,7 +421,7 @@ void Obituary(entity attacker, entity inflictor, entity targ, int deathtype) 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, @@ -467,13 +432,13 @@ void Obituary(entity attacker, entity inflictor, entity targ, int deathtype) 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; - if(deathtype == DEATH_BUFF) - f3 = attacker.buffs; + int f3 = 0; + if(deathtype == DEATH_BUFF.m_id) + 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); @@ -485,7 +450,7 @@ void Obituary(entity attacker, entity inflictor, entity targ, int deathtype) // ============= else { - switch(deathtype) + switch(DEATH_ENT(deathtype)) { // For now, we're just forcing HURTTRIGGER to behave as "DEATH_VOID" and giving it no special options... // Later on you will only be able to make custom messages using DEATH_CUSTOM, @@ -537,7 +502,7 @@ void Obituary(entity attacker, entity inflictor, entity targ, int deathtype) void Ice_Think() {SELFPARAM(); - if(!self.owner.frozen || self.owner.iceblock != self) + if(!STAT(FROZEN, self.owner) || self.owner.iceblock != self) { remove(self); return; @@ -551,21 +516,19 @@ void Freeze (entity targ, float freeze_time, float frozen_type, float show_waypo 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; - entity ice, head; - ice = spawn(); + entity ice = new(ice); ice.owner = targ; - ice.classname = "ice"; ice.scale = targ.scale; ice.think = Ice_Think; ice.nextthink = time; @@ -577,13 +540,11 @@ void Freeze (entity targ, float freeze_time, float frozen_type, float show_waypo targ.iceblock = ice; targ.revival_time = 0; - WITH(entity, self, ice, Ice_Think()); + WITHSELF(ice, Ice_Think()); RemoveGrapplingHook(targ); - 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) @@ -592,23 +553,21 @@ void Freeze (entity targ, float freeze_time, float frozen_type, float show_waypo void Unfreeze (entity targ) { - if(!targ.frozen) + SELFPARAM(); + 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; 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) @@ -625,7 +584,7 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, int d mirrordamage = 0; mirrorforce = 0; - if (gameover || targ.killcount == -666) + if (gameover || targ.killcount == FRAGS_SPECTATOR) return; setself(targ); @@ -641,7 +600,7 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, int d RemoveGrapplingHook(targ); // STOP THAT, you parasite! // special rule: gravity bomb does not hit team mates (other than for disconnecting the hook) - if(DEATH_ISWEAPON(deathtype, WEP_HOOK.m_id) || DEATH_ISWEAPON(deathtype, WEP_TUBA.m_id)) + if(DEATH_ISWEAPON(deathtype, WEP_HOOK) || DEATH_ISWEAPON(deathtype, WEP_TUBA)) { if(IS_PLAYER(targ)) if(SAME_TEAM(targ, attacker)) @@ -651,7 +610,7 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, int d } } - if(deathtype == DEATH_KILL || deathtype == DEATH_TEAMCHANGE || deathtype == DEATH_AUTOTEAMCHANGE) + 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) @@ -666,14 +625,14 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, int d targ.flags -= targ.flags & FL_GODMODE; damage = 100000; } - else if(deathtype == DEATH_MIRRORDAMAGE || deathtype == DEATH_NOAMMO) + else if(deathtype == DEATH_MIRRORDAMAGE.m_id || deathtype == DEATH_NOAMMO.m_id) { // no processing } else { // nullify damage if teamplay is on - if(deathtype != DEATH_TELEFRAG) + if(deathtype != DEATH_TELEFRAG.m_id) if(IS_PLAYER(attacker)) { if(IS_PLAYER(targ) && targ != attacker && (IS_INDEPENDENT_PLAYER(attacker) || IS_INDEPENDENT_PLAYER(targ))) @@ -691,7 +650,7 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, int d 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; @@ -744,25 +703,25 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, int d mirrordamage = frag_mirrordamage; force = frag_force; - if(targ.frozen) - if(deathtype != DEATH_HURTTRIGGER && deathtype != DEATH_TEAMCHANGE && deathtype != DEATH_AUTOTEAMCHANGE) + if(STAT(FROZEN, targ)) + if(deathtype != DEATH_HURTTRIGGER.m_id && deathtype != DEATH_TEAMCHANGE.m_id && deathtype != DEATH_AUTOTEAMCHANGE.m_id) { - if(autocvar_g_freezetag_revive_falldamage > 0) - if(deathtype == DEATH_FALL) - if(damage >= autocvar_g_freezetag_revive_falldamage) + if(autocvar_g_frozen_revive_falldamage > 0) + if(deathtype == DEATH_FALL.m_id) + if(damage >= autocvar_g_frozen_revive_falldamage) { Unfreeze(targ); - targ.health = autocvar_g_freezetag_revive_falldamage_health; + 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_ONE, targ, MSG_CENTER, CENTER_FREEZETAG_REVIVE_SELF); } damage = 0; - force *= autocvar_g_freezetag_frozen_force; + force *= autocvar_g_frozen_force; } - if(targ.frozen && deathtype == DEATH_HURTTRIGGER && !autocvar_g_freezetag_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); @@ -826,8 +785,8 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, int d // count the damage if(attacker) - if(!targ.deadflag) - if(deathtype != DEATH_BUFF) + if(!IS_DEAD(targ)) + if(deathtype != DEATH_BUFF.m_id) if(targ.takedamage == DAMAGE_AIM) if(targ != attacker) { @@ -839,13 +798,13 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, int d 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) + if(deathtype != DEATH_FIRE.m_id) { - if(victim.BUTTON_CHAT) + if(PHYS_INPUT_BUTTON_CHAT(victim)) attacker.typehitsound += 1; else attacker.damage_dealt += damage; @@ -864,7 +823,7 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, int d } else { - if(deathtype != DEATH_FIRE) + if(deathtype != DEATH_FIRE.m_id) { attacker.typehitsound += 1; } @@ -888,9 +847,7 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, int d vector farce = damage_explosion_calcpush(self.damageforcescale * force, self.velocity, autocvar_g_balance_damagepush_speedfactor); if(self.movetype == MOVETYPE_PHYSICS) { - entity farcent; - farcent = spawn(); - farcent.classname = "farce"; + entity farcent = new(farce); farcent.enemy = self; farcent.movedir = farce * 10; if(self.mass) @@ -898,21 +855,21 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, int d farcent.origin = hitloc; farcent.forcetype = FORCETYPE_FORCEATPOS; farcent.nextthink = time + 0.1; - farcent.think = SUB_Remove; + farcent.think = SUB_Remove_self; } else { self.velocity = self.velocity + farce; self.move_velocity = self.velocity; } - self.flags &= ~FL_ONGROUND; + UNSET_ONGROUND(self); self.move_flags &= ~FL_ONGROUND; UpdateCSQCProjectile(self); } // apply damage if (damage != 0 || (self.damageforcescale && vlen(force))) if (self.event_damage) - self.event_damage (inflictor, attacker, damage, deathtype, hitloc, force); + self.event_damage (self, inflictor, attacker, damage, deathtype, hitloc, force); setself(this); // apply mirror damage if any @@ -921,7 +878,7 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, int d attacker = attacker_save; force = normalize(attacker.origin + attacker.view_ofs - hitloc) * mirrorforce; - Damage(attacker, inflictor, attacker, mirrordamage, DEATH_MIRRORDAMAGE, attacker.origin, force); + Damage(attacker, inflictor, attacker, mirrordamage, DEATH_MIRRORDAMAGE.m_id, attacker.origin, force); } } @@ -951,7 +908,7 @@ float RadiusDamageForSource (entity inflictor, vector inflictororigin, vector in total_damage_to_creatures = 0; if(deathtype != (WEP_HOOK.m_id | HITTYPE_SECONDARY | HITTYPE_BOUNCE)) // only send gravity bomb damage once - if(DEATH_WEAPONOF(deathtype) != WEP_TUBA.m_id) // do not send tuba damage (bandwidth hog) + if(DEATH_WEAPONOF(deathtype) != WEP_TUBA) // do not send tuba damage (bandwidth hog) { force = inflictorvelocity; if(vlen(force) == 0) @@ -1109,7 +1066,7 @@ float RadiusDamageForSource (entity inflictor, vector inflictororigin, vector in RadiusDamage_running = 0; if(!DEATH_ISSPECIAL(deathtype)) - accuracy_add(attacker, DEATH_WEAPONOF(deathtype), 0, min(coredamage, stat_damagedone)); + accuracy_add(attacker, DEATH_WEAPONOF(deathtype).m_id, 0, min(coredamage, stat_damagedone)); return total_damage_to_creatures; } @@ -1131,7 +1088,7 @@ float Fire_AddDamage(entity e, entity o, float d, float t, float dt) if(IS_PLAYER(e)) { - if(e.deadflag) + if(IS_DEAD(e)) return -1; } else @@ -1139,8 +1096,7 @@ float Fire_AddDamage(entity e, entity o, float d, float t, float dt) if(!e.fire_burner) { // print("adding a fire burner to ", e.classname, "\n"); - e.fire_burner = spawn(); - e.fire_burner.classname = "fireburner"; + e.fire_burner = new(fireburner); e.fire_burner.think = fireburner_think; e.fire_burner.nextthink = time; e.fire_burner.owner = e; @@ -1225,7 +1181,7 @@ float Fire_AddDamage(entity e, entity o, float d, float t, float dt) } } if(accuracy_isgooddamage(o, e)) - accuracy_add(o, DEATH_WEAPONOF(dt), 0, max(0, totaldamage - mindamage)); + accuracy_add(o, DEATH_WEAPONOF(dt).m_id, 0, max(0, totaldamage - mindamage)); return max(0, totaldamage - mindamage); // can never be negative, but to make sure } else @@ -1239,7 +1195,7 @@ float Fire_AddDamage(entity e, entity o, float d, float t, float dt) e.fire_owner = o; e.fire_hitsound = false; if(accuracy_isgooddamage(o, e)) - accuracy_add(o, DEATH_WEAPONOF(dt), 0, d); + accuracy_add(o, DEATH_WEAPONOF(dt).m_id, 0, d); return d; } } @@ -1262,7 +1218,7 @@ void Fire_ApplyDamage(entity 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); @@ -1278,20 +1234,18 @@ void Fire_ApplyDamage(entity e) } 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); - } - } + 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)