summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 13368a9)
raw | patch | inline | side by side (parent: 13368a9)
author | fgsfds <pvt.fgsfds@gmail.com> | |
Thu, 6 May 2021 15:03:10 +0000 (18:03 +0300) | ||
committer | fgsfds <pvt.fgsfds@gmail.com> | |
Thu, 6 May 2021 15:03:10 +0000 (18:03 +0300) |
src/game/g_weapons.pas | patch | blob | history |
diff --git a/src/game/g_weapons.pas b/src/game/g_weapons.pas
index a64d9872abf86eef5e60a7239d21f41a51308321..4f91b9fc7acc5c5e16e6a9138ac777793a97b471 100644 (file)
--- a/src/game/g_weapons.pas
+++ b/src/game/g_weapons.pas
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