X-Git-Url: http://deadsoftware.ru/gitweb?p=d2df-sdl.git;a=blobdiff_plain;f=src%2Fgame%2Fg_player.pas;h=b04cdc2cf1a42740ce70fbbacf5143bbb8dd0b54;hp=9aa72a832c3c6d2cf52adfdb1ac70adcee3565cf;hb=ee6a478c8d12874a73114ff61919bf870e4dd475;hpb=ee1df96f7123dcf3cdf0b0527cf7a790ec9d8d64

diff --git a/src/game/g_player.pas b/src/game/g_player.pas
index 9aa72a8..b04cdc2 100644
--- a/src/game/g_player.pas
+++ b/src/game/g_player.pas
@@ -3381,11 +3381,15 @@ begin
 
   if SpawnerUID = FUID then
     begin // Ñàìîóáèëñÿ
-      if Srv and (gGameSettings.GameMode = GM_TDM) then
-      Dec(gTeamStat[FTeam].Goals);
+      if Srv then
       begin
-        Dec(FFrags);
-        FLastFrag := 0;
+        if gGameSettings.GameMode = GM_TDM then
+          Dec(gTeamStat[FTeam].Goals);
+        if DoFrags or (gGameSettings.GameMode = GM_TDM) then
+        begin
+          Dec(FFrags);
+          FLastFrag := 0;
+        end;
       end;
       g_Console_Add(Format(_lc[I_PLAYER_KILL_SELF], [FName]), True);
     end