game: move assists to another procedure block

[d2df-sdl.git] / src / game / g_player.pas

diff --git a/src/game/g_player.pas b/src/game/g_player.pas
index c903d13b0a780cc97c993011d746ba58be2be061..4e5b60e453dce9ab8e20e4fcaf921b15e256fb32 100644 (file)
--- a/src/game/g_player.pas
+++ b/src/game/g_player.pas
@@ -3439,7 +3439,6 @@ var
   plr: TPlayer;
   srv, netsrv: Boolean;
   DoFrags: Boolean;
-  DoAssists: Boolean;
   OldLR: Byte;
   KP: TPlayer;
   it: PItem;
@@ -3477,7 +3476,6 @@ var
 
 begin
   DoFrags := (gGameSettings.MaxLives = 0) or (gGameSettings.GameMode = GM_COOP);
-  DoAssists := (gGameSettings.GameMode = GM_TDM) or (gGameSettings.GameMode = GM_CTF);
   Srv := g_Game_IsServer;
   Netsrv := g_Game_IsServer and g_Game_IsNet;
   if Srv then FDeath := FDeath + 1;
@@ -3566,15 +3564,6 @@ begin
               KP.FragCombo();
             end;
 
-          // Assists block
-          if (DoAssists or (gGameSettings.GameMode = GM_TDM)) then
-            begin
-              if a = 4 then
-              begin
-                Inc(KP.FAssists);
-              end;
-            end;
-
           if (gGameSettings.GameMode = GM_TDM) and DoFrags then
             Inc(gTeamStat[KP.Team].Score,
               IfThen(SameTeam(FUID, SpawnerUID), -1, 1));
@@ -3861,6 +3850,23 @@ begin
   FNextWeapDelay := 0;
 end;
 
+// Assists block
+procedure TPlayer.Assist();
+var
+  DoAssists: Boolean;
+begin
+  DoAssists := (gGameSettings.GameMode = GM_TDM) or (gGameSettings.GameMode = GM_CTF);
+
+  if (DoAssists or (gGameSettings.GameMode = GM_TDM)) then
+  begin
+    if a = 4 then
+    begin
+      Inc(KP.FAssists);
+    end;
+  end;
+end;
+
+
 function TPlayer.hasAmmoForWeapon (weapon: Byte): Boolean;
 begin
   result := false;