Skip to content
This repository has been archived by the owner on Mar 19, 2023. It is now read-only.

Commit

Permalink
Monsters: Consider fallen out monsters as killed
Browse files Browse the repository at this point in the history
  • Loading branch information
binarymaster committed Jan 12, 2016
1 parent 58b3a9d commit aef4a19
Showing 1 changed file with 13 additions and 6 deletions.
19 changes: 13 additions & 6 deletions DF Sources/g_monsters.pas
Expand Up @@ -1666,7 +1666,8 @@ function TMonster.Damage(Damage: Word; VelX, VelY: Integer; SpawnerUID: Word; t:
if gLMSRespawn = LMS_RESPAWN_NONE then
begin
Inc(gCoopMonstersKilled);
if g_Game_IsNet then MH_SEND_GameStats;
if g_Game_IsNet then
MH_SEND_GameStats;
end;
end;

Expand Down Expand Up @@ -2029,13 +2030,19 @@ procedure TMonster.Update();
// Âûëåòåë çà êàðòó - óäàëÿåì è çàïóñêàåì òðèããåðû:
if WordBool(st and MOVE_FALLOUT) or (FObj.X < -1000) or
(FObj.X > gMapInfo.Width+1000) or (FObj.Y < -1000) then
begin
begin
FRemoved := True;
if gLMSRespawn = LMS_RESPAWN_NONE then
begin
Inc(gCoopMonstersKilled);
if g_Game_IsNet then
MH_SEND_GameStats;
end;
ActivateTriggers();
Exit;
end;
end;

oldvelx := FObj.Vel.X;
oldvelx := FObj.Vel.X;

// Ñîïðîòèâëåíèå âîçäóõà äëÿ òðóïà:
if (FState = STATE_DIE) or (FState = STATE_DEAD) then
Expand Down Expand Up @@ -2918,10 +2925,10 @@ procedure TMonster.ClientUpdate();
// Âûëåòåë çà êàðòó - óäàëÿåì è çàïóñêàåì òðèããåðû:
if WordBool(st and MOVE_FALLOUT) or (FObj.X < -1000) or
(FObj.X > gMapInfo.Width+1000) or (FObj.Y < -1000) then
begin
begin
FRemoved := True;
Exit;
end;
end;

oldvelx := FObj.Vel.X;

Expand Down

0 comments on commit aef4a19

Please sign in to comment.