X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fg_damage.qc;h=83911eeafec9aa0b5d16120444a74b465acefbb8;hb=b391c0391598ea991409c0ddfbf4abb09d3fda51;hp=92710cc58264c14e1958297604cb0c32a9b3790b;hpb=640749c392e1312c4b43b8fbc0a7c9ee2acf9041;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/g_damage.qc b/qcsrc/server/g_damage.qc index 92710cc58..83911eeaf 100644 --- a/qcsrc/server/g_damage.qc +++ b/qcsrc/server/g_damage.qc @@ -1,15 +1,15 @@ #include "g_damage.qh" -#include "bot/bot.qh" +#include "bot/api.qh" #include "g_hook.qh" -#include "mutators/all.qh" +#include "mutators/_mod.qh" #include "scores.qh" #include "spawnpoints.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/items/_mod.qh" #include "../common/mutators/mutator/waypoints/waypointsprites.qh" #include "weapons/accuracy.qh" #include "weapons/csqcprojectile.qh" @@ -21,19 +21,19 @@ #include "../common/playerstats.qh" #include "../common/teams.qh" #include "../common/util.qh" -#include "../common/weapons/all.qh" +#include #include "../lib/csqcmodel/sv_model.qh" #include "../lib/warpzone/common.qh" -void UpdateFrags(entity player, float f) +void UpdateFrags(entity player, int f) { PlayerTeamScore_AddScore(player, f); } void GiveFrags (entity attacker, entity targ, float f, int deathtype) -{SELFPARAM(); +{ // TODO route through PlayerScores instead - if(gameover) return; + if(game_stopped) return; if(f < 0) { @@ -58,13 +58,15 @@ void GiveFrags (entity attacker, entity targ, float f, int deathtype) PlayerScore_Add(targ, SP_DEATHS, 1); + .entity weaponentity = weaponentities[0]; // TODO: unhardcode + if(targ != attacker) // not for suicides if(g_weaponarena_random) { // 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 = PS(attacker).m_weapon; - else if(!(attacker.weapons & (culprit.m_wepset))) culprit = PS(attacker).m_weapon; + if(!culprit) culprit = attacker.(weaponentity).m_weapon; + else if(!(attacker.weapons & (culprit.m_wepset))) culprit = attacker.(weaponentity).m_weapon; if(g_weaponarena_random_with_blaster && culprit == WEP_BLASTER) // WEAPONTODO: Shouldn't this be in a mutator? { @@ -97,15 +99,13 @@ void GiveFrags (entity attacker, entity targ, float f, int deathtype) } // after a frag, choose another random weapon set - if (!(attacker.weapons & WepSet_FromWeapon(PS(attacker).m_weapon))) - W_SwitchWeapon_Force(attacker, w_getbestweapon(attacker)); + if (!(attacker.weapons & WepSet_FromWeapon(attacker.(weaponentity).m_weapon))) + W_SwitchWeapon_Force(attacker, w_getbestweapon(attacker, weaponentity), weaponentity); } // 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; @@ -113,19 +113,24 @@ void GiveFrags (entity attacker, entity targ, float f, int deathtype) UpdateFrags(attacker, f); } +.entity kh_next; + string AppendItemcodes(string s, entity player) { - int w = PS(player).m_weapon.m_id; - //if(w == 0) - // w = player.switchweapon; - if(w == 0) - w = player.cnt; // previous weapon! - s = strcat(s, ftos(w)); + for(int slot = 0; slot < MAX_WEAPONSLOTS; ++slot) + { + .entity weaponentity = weaponentities[slot]; + int w = player.(weaponentity).m_weapon.m_id; + if(w == 0) + w = player.(weaponentity).cnt; // previous weapon + if(w != 0 || slot == 0) + s = strcat(s, ftos(w)); + } if(time < player.strength_finished) 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(PHYS_INPUT_BUTTON_CHAT(player)) s = strcat(s, "T"); @@ -264,6 +269,18 @@ float Obituary_WeaponDeath( return false; } +bool frag_centermessage_override(entity attacker, entity targ, int deathtype, int kill_count_to_attacker, int kill_count_to_target) +{ + if(deathtype == DEATH_FIRE.m_id) + { + Send_Notification(NOTIF_ONE, attacker, MSG_CHOICE, CHOICE_FRAG_FIRE, targ.netname, kill_count_to_attacker, (IS_BOT_CLIENT(targ) ? -1 : CS(targ).ping)); + Send_Notification(NOTIF_ONE, targ, MSG_CHOICE, CHOICE_FRAGGED_FIRE, attacker.netname, kill_count_to_target, attacker.health, attacker.armorvalue, (IS_BOT_CLIENT(attacker) ? -1 : CS(attacker).ping)); + return true; + } + + return MUTATOR_CALLHOOK(FragCenterMessage, attacker, targ, deathtype, kill_count_to_attacker, kill_count_to_target); +} + .int buffs = _STAT(BUFFS); // TODO: remove entity buff_FirstFromFlags(int _buffs); void Obituary(entity attacker, entity inflictor, entity targ, int deathtype) @@ -277,7 +294,6 @@ void Obituary(entity attacker, entity inflictor, entity targ, int deathtype) // Set final information for the death targ.death_origin = targ.origin; - if(targ != attacker) { targ.killer_origin = attacker.origin; } string deathlocation = (autocvar_notification_server_allows_location ? NearestLocation(targ.death_origin) : ""); #ifdef NOTIFICATIONS_DEBUG @@ -310,19 +326,19 @@ void Obituary(entity attacker, entity inflictor, entity targ, int deathtype) { case DEATH_MIRRORDAMAGE: { - Obituary_SpecialDeath(targ, false, deathtype, targ.netname, deathlocation, "", targ.killcount, 0, 0); + Obituary_SpecialDeath(targ, false, deathtype, targ.netname, deathlocation, "", CS(targ).killcount, 0, 0); break; } default: { - Obituary_SpecialDeath(targ, false, deathtype, targ.netname, deathlocation, "", targ.killcount, 0, 0); + Obituary_SpecialDeath(targ, false, deathtype, targ.netname, deathlocation, "", CS(targ).killcount, 0, 0); break; } } } } - else if (!Obituary_WeaponDeath(targ, false, deathtype, targ.netname, deathlocation, "", targ.killcount, 0)) + else if (!Obituary_WeaponDeath(targ, false, deathtype, targ.netname, deathlocation, "", CS(targ).killcount, 0)) { backtrace("SUICIDE: what the hell happened here?\n"); return; @@ -342,11 +358,11 @@ void Obituary(entity attacker, entity inflictor, entity targ, int deathtype) LogDeath("tk", deathtype, attacker, targ); GiveFrags(attacker, targ, -1, deathtype); - attacker.killcount = 0; + CS(attacker).killcount = 0; 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(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, CS(targ).killcount); // In this case, the death message will ALWAYS be "foo was betrayed by bar" // No need for specific death/weapon messages... @@ -356,8 +372,10 @@ void Obituary(entity attacker, entity inflictor, entity targ, int deathtype) LogDeath("frag", deathtype, attacker, targ); GiveFrags(attacker, targ, 1, deathtype); - attacker.taunt_soundtime = time + 1; - attacker.killcount = attacker.killcount + 1; + CS(attacker).taunt_soundtime = time + 1; + CS(attacker).killcount = CS(attacker).killcount + 1; + + attacker.killsound += 1; #define SPREE_ITEM(counta,countb,center,normal,gentle) \ case counta: \ @@ -366,7 +384,7 @@ void Obituary(entity attacker, entity inflictor, entity targ, int deathtype) PS_GR_P_ADDVAL(attacker, PLAYERSTATS_ACHIEVEMENT_KILL_SPREE_##counta, 1); \ break; \ } - switch(attacker.killcount) + switch(CS(attacker).killcount) { KILL_SPREE_LIST default: break; @@ -386,7 +404,7 @@ void Obituary(entity attacker, entity inflictor, entity targ, int deathtype) } else { - kill_count_to_attacker = attacker.killcount; + kill_count_to_attacker = CS(attacker).killcount; kill_count_to_target = 0; } @@ -399,7 +417,7 @@ void Obituary(entity attacker, entity inflictor, entity targ, int deathtype) CHOICE_TYPEFRAG, targ.netname, kill_count_to_attacker, - (IS_BOT_CLIENT(targ) ? -1 : targ.ping) + (IS_BOT_CLIENT(targ) ? -1 : CS(targ).ping) ); Send_Notification( NOTIF_ONE, @@ -410,10 +428,10 @@ void Obituary(entity attacker, entity inflictor, entity targ, int deathtype) kill_count_to_target, attacker.health, attacker.armorvalue, - (IS_BOT_CLIENT(attacker) ? -1 : attacker.ping) + (IS_BOT_CLIENT(attacker) ? -1 : CS(attacker).ping) ); } - else + else if(!frag_centermessage_override(attacker, targ, deathtype, kill_count_to_attacker, kill_count_to_target)) { Send_Notification( NOTIF_ONE, @@ -422,7 +440,7 @@ void Obituary(entity attacker, entity inflictor, entity targ, int deathtype) CHOICE_FRAG, targ.netname, kill_count_to_attacker, - (IS_BOT_CLIENT(targ) ? -1 : targ.ping) + (IS_BOT_CLIENT(targ) ? -1 : CS(targ).ping) ); Send_Notification( NOTIF_ONE, @@ -433,7 +451,7 @@ void Obituary(entity attacker, entity inflictor, entity targ, int deathtype) kill_count_to_target, attacker.health, attacker.armorvalue, - (IS_BOT_CLIENT(attacker) ? -1 : attacker.ping) + (IS_BOT_CLIENT(attacker) ? -1 : CS(attacker).ping) ); } @@ -441,8 +459,8 @@ void Obituary(entity attacker, entity inflictor, entity targ, int deathtype) 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); + if (!Obituary_WeaponDeath(targ, true, deathtype, targ.netname, attacker.netname, deathlocation, CS(targ).killcount, kill_count_to_attacker)) + Obituary_SpecialDeath(targ, true, deathtype, targ.netname, attacker.netname, deathlocation, CS(targ).killcount, kill_count_to_attacker, f3); } } @@ -462,7 +480,7 @@ void Obituary(entity attacker, entity inflictor, entity targ, int deathtype) targ.netname, inflictor.message, deathlocation, - targ.killcount, + CS(targ).killcount, 0, 0); break; @@ -474,7 +492,7 @@ void Obituary(entity attacker, entity inflictor, entity targ, int deathtype) targ.netname, ((strstrofs(deathmessage, "%", 0) < 0) ? strcat("%s ", deathmessage) : deathmessage), deathlocation, - targ.killcount, + CS(targ).killcount, 0, 0); break; @@ -482,7 +500,7 @@ void Obituary(entity attacker, entity inflictor, entity targ, int deathtype) default: { - Obituary_SpecialDeath(targ, false, deathtype, targ.netname, deathlocation, "", targ.killcount, 0, 0); + Obituary_SpecialDeath(targ, false, deathtype, targ.netname, deathlocation, "", CS(targ).killcount, 0, 0); break; } } @@ -498,22 +516,22 @@ void Obituary(entity attacker, entity inflictor, entity targ, int deathtype) } // reset target kill count - if(targ.killcount) { targ.killcount = 0; } + CS(targ).killcount = 0; } void Ice_Think(entity this) { - if(!STAT(FROZEN, self.owner) || self.owner.iceblock != self) + if(!STAT(FROZEN, this.owner) || this.owner.iceblock != this) { - remove(self); + delete(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; @@ -526,7 +544,9 @@ void Freeze (entity targ, float freeze_time, float frozen_type, float show_waypo 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; + if(targ.bot_attack) + IL_REMOVE(g_bot_targets, targ); + targ.bot_attack = false; entity ice = new(ice); ice.owner = targ; @@ -541,63 +561,71 @@ void Freeze (entity targ, float freeze_time, float frozen_type, float show_waypo targ.iceblock = ice; targ.revival_time = 0; - WITHSELF(ice, Ice_Think(ice)); + Ice_Think(ice); - RemoveGrapplingHook(targ); + RemoveGrapplingHooks(targ); - FOREACH_CLIENT(IS_PLAYER(it) && it.hook.aiment == targ, LAMBDA(RemoveGrapplingHook(it))); + FOREACH_CLIENT(IS_PLAYER(it), + { + for(int slot = 0; slot < MAX_WEAPONSLOTS; ++slot) + { + .entity weaponentity = weaponentities[slot]; + if(it.(weaponentity).hook.aiment == targ) + RemoveHook(it.(weaponentity).hook); + } + }); // 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) { - SELFPARAM(); if(!STAT(FROZEN, targ)) return; 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); + targ.pauseregen_finished = time + autocvar_g_balance_pause_health_regen; + } STAT(FROZEN, targ) = 0; targ.revive_progress = 0; targ.revival_time = time; - self.bot_attack = true; + if(!targ.bot_attack) + IL_PUSH(g_bot_targets, targ); + targ.bot_attack = true; WaypointSprite_Kill(targ.waypointsprite_attached); - FOREACH_CLIENT(IS_PLAYER(it) && it.hook.aiment == targ, LAMBDA(RemoveGrapplingHook(it))); + FOREACH_CLIENT(IS_PLAYER(it), + { + for(int slot = 0; slot < MAX_WEAPONSLOTS; ++slot) + { + .entity weaponentity = weaponentities[slot]; + if(it.(weaponentity).hook.aiment == targ) + RemoveHook(it.(weaponentity).hook); + } + }); // remove the ice block if(targ.iceblock) - remove(targ.iceblock); - targ.iceblock = world; + delete(targ.iceblock); + targ.iceblock = NULL; } void Damage (entity targ, entity inflictor, entity attacker, float damage, int deathtype, vector hitloc, vector force) { - float mirrordamage; - float mirrorforce; float complainteamdamage = 0; - entity attacker_save; - mirrordamage = 0; - mirrorforce = 0; + float mirrordamage = 0; + float mirrorforce = 0; - if (gameover || targ.killcount == FRAGS_SPECTATOR) + if (game_stopped || (IS_CLIENT(targ) && CS(targ).killcount == FRAGS_SPECTATOR)) return; - damage_targ = targ; - damage_inflictor = inflictor; - damage_attacker = attacker; - attacker_save = attacker; - - if(IS_PLAYER(targ)) - if(targ.hook) - if(targ.hook.aiment) - if(targ.hook.aiment == attacker) - RemoveGrapplingHook(targ); // STOP THAT, you parasite! + entity attacker_save = attacker; // 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)) @@ -612,7 +640,7 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, int d { // exit the vehicle before killing (fixes a crash) if(IS_PLAYER(targ) && targ.vehicle) - WITHSELF(targ, vehicles_exit(VHEF_RELEASE)); + vehicles_exit(targ.vehicle, VHEF_RELEASE); // These are ALWAYS lethal // No damage modification here @@ -696,11 +724,21 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, int d } // should this be changed at all? If so, in what way? - MUTATOR_CALLHOOK(PlayerDamage_Calculate, inflictor, attacker, targ, deathtype, damage, mirrordamage, force); + MUTATOR_CALLHOOK(Damage_Calculate, inflictor, attacker, targ, deathtype, damage, mirrordamage, force); damage = M_ARGV(4, float); mirrordamage = M_ARGV(5, float); force = M_ARGV(6, vector); + if(IS_PLAYER(targ) && damage > 0 && attacker) + { + for(int slot = 0; slot < MAX_WEAPONSLOTS; ++slot) + { + .entity weaponentity = weaponentities[slot]; + if(targ.(weaponentity).hook && targ.(weaponentity).hook.aiment == attacker) + RemoveHook(targ.(weaponentity).hook); + } + } + if(STAT(FROZEN, targ)) if(deathtype != DEATH_HURTTRIGGER.m_id && deathtype != DEATH_TEAMCHANGE.m_id && deathtype != DEATH_AUTOTEAMCHANGE.m_id) { @@ -711,7 +749,7 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, int d 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); } @@ -744,10 +782,9 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, int d targ.oldvelocity = targ.velocity; targ.spawnorigin = spot.origin; - setorigin (targ, spot.origin + '0 0 1' * (1 - targ.mins.z - 24)); + 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 targ.oldorigin = targ.origin; - targ.prevorigin = targ.origin; Send_Effect(EFFECT_TELEPORT, targ.origin, '0 0 0', 1); } @@ -791,7 +828,7 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, int d else victim = targ; - if(IS_PLAYER(victim) || (IS_TURRET(victim) && victim.active == ACTIVE_ACTIVE) || IS_MONSTER(victim) || MUTATOR_CALLHOOK(PlayHitsound, victim)) + if(IS_PLAYER(victim) || (IS_TURRET(victim) && victim.active == ACTIVE_ACTIVE) || IS_MONSTER(victim) || MUTATOR_CALLHOOK(PlayHitsound, victim, attacker)) { if(DIFF_TEAM(victim, attacker) && !STAT(FROZEN, victim)) { @@ -816,18 +853,18 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, int d } } } - else + else if(IS_PLAYER(attacker)) { if(deathtype != DEATH_FIRE.m_id) { attacker.typehitsound += 1; } if(complainteamdamage > 0) - if(time > attacker.teamkill_complain) + if(time > CS(attacker).teamkill_complain) { - attacker.teamkill_complain = time + 5; - attacker.teamkill_soundtime = time + 0.4; - attacker.teamkill_soundsource = targ; + CS(attacker).teamkill_complain = time + 5; + CS(attacker).teamkill_soundtime = time + 0.4; + CS(attacker).teamkill_soundsource = targ; } } } @@ -836,11 +873,11 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, int d // apply push if (targ.damageforcescale) - if (vlen(force)) + if (force) if (!IS_PLAYER(targ) || time >= targ.spawnshieldtime || targ == attacker) { vector farce = damage_explosion_calcpush(targ.damageforcescale * force, targ.velocity, autocvar_g_balance_damagepush_speedfactor); - if(targ.movetype == MOVETYPE_PHYSICS) + if(targ.move_movetype == MOVETYPE_PHYSICS) { entity farcent = new(farce); farcent.enemy = targ; @@ -855,14 +892,12 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, int d else { targ.velocity = targ.velocity + farce; - targ.move_velocity = targ.velocity; } UNSET_ONGROUND(targ); - targ.move_flags &= ~FL_ONGROUND; UpdateCSQCProjectile(targ); } // apply damage - if (damage != 0 || (targ.damageforcescale && vlen(force))) + if (damage != 0 || (targ.damageforcescale && force)) if (targ.event_damage) targ.event_damage (targ, inflictor, attacker, damage, deathtype, hitloc, force); @@ -906,7 +941,7 @@ float RadiusDamageForSource (entity inflictor, vector inflictororigin, vector in 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); @@ -989,7 +1024,7 @@ float RadiusDamageForSource (entity inflictor, vector inflictororigin, vector in LOG_INFOF("THROUGHFLOOR: D=%f F=%f max(dD)=1/%f max(dF)=1/%f", finaldmg, vlen(force), mininv_d, mininv_f); - total = 0.25 * pow(max(mininv_f, mininv_d), 2); + total = 0.25 * (max(mininv_f, mininv_d) ** 2); if(autocvar_g_throughfloor_debug) LOG_INFOF(" steps=%f", total); @@ -1037,7 +1072,7 @@ float RadiusDamageForSource (entity inflictor, vector inflictororigin, vector in // print(" finaldmg ", ftos(finaldmg), " force ", vtos(force)); // print(" (", ftos(a), ")\n"); //} - if(finaldmg || vlen(force)) + if(finaldmg || force) { if(targ.iscreature) { @@ -1254,18 +1289,18 @@ void Fire_ApplyEffect(entity e) void fireburner_think(entity this) { // for players, this is done in the regular loop - if(wasfreed(self.owner)) + if(wasfreed(this.owner)) { - remove(self); + delete(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; + delete(this); return; } - Fire_ApplyDamage(self.owner); - self.nextthink = time; + Fire_ApplyDamage(this.owner); + this.nextthink = time; }