index cc4926a3135a2a5a97cfa4a3e06e71907eea6008..e37e2e448b5115c204097f6c81c5467e5e01d5ae 100644 (file)
--- a/src/game/g_monsters.pas
+++ b/src/game/g_monsters.pas
FShellTimer: Integer;
FShellType: Byte;
FFirePainTime: Integer;
+ FFireAttacker: Word;
vilefire: TAnimation;
FDieTriggers: Array of Integer;
function AnimIsReverse: Boolean;
function shoot(o: PObj; immediately: Boolean): Boolean;
function kick(o: PObj): Boolean;
- procedure CatchFire();
+ procedure CatchFire(Attacker: Word);
procedure OnFireFlame(Times: DWORD = 1);
property MonsterType: Byte read FMonsterType;
FBehaviour := BH_NORMAL;
FFireTime := 0;
FFirePainTime := 0;
+ FFireAttacker := 0;
if FMonsterType in [MONSTER_ROBO, MONSTER_BARREL] then
FBloodKind := BLOOD_SPARKS
if (FState <> STATE_DIE) and (FState <> STATE_DEAD) then
if FFirePainTime = 0 then
begin
- Damage(5, 0, 0, 0, HIT_FLAME);
+ Damage(5, FFireAttacker, 0, 0, HIT_FLAME);
FFirePainTime := 18;
end
else
SetLength(FDieTriggers, 0);
end;
-procedure TMonster.CatchFire();
+procedure TMonster.CatchFire(Attacker: Word);
begin
- FFireTime := 360;
+ FFireTime := 100;
+ FFireAttacker := Attacker;
if g_Game_IsNet and g_Game_IsServer then
MH_SEND_MonsterState(FUID);
end;