X-Git-Url: https://deadsoftware.ru/gitweb?p=d2df-sdl.git;a=blobdiff_plain;f=src%2Fgame%2Fg_weapons.pas;h=4f91b9fc7acc5c5e16e6a9138ac777793a97b471;hp=a64d9872abf86eef5e60a7239d21f41a51308321;hb=ed682e59e24d29ff40949d410f12cc936c0b628d;hpb=13368a9269fe9fa4850a53f4611b3ec23b544d03 diff --git a/src/game/g_weapons.pas b/src/game/g_weapons.pas index a64d987..4f91b9f 100644 --- a/src/game/g_weapons.pas +++ b/src/game/g_weapons.pas @@ -894,8 +894,9 @@ begin end; // È â êîíöå èãðîêîâ, íî òîëüêî åñëè ïîëîæåíî - // (èëè friendlyfire, èëè friendly_hit_projectile) - if LongBool(gGameSettings.Options and (GAME_OPTION_TEAMDAMAGE or GAME_OPTION_TEAMHITPROJECTILE)) then + // (èëè ñíàðÿä îò ìîíñòðà, èëè friendlyfire, èëè friendly_hit_projectile) + if (g_GetUIDType(SpawnerUID) <> UID_PLAYER) or + LongBool(gGameSettings.Options and (GAME_OPTION_TEAMDAMAGE or GAME_OPTION_TEAMHITPROJECTILE)) then begin if PlayerHit() then begin