X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_map.pas;h=2b8e9ff34d5875ab0042b71f15b9936bfb680e97;hb=493befdc432063207dc653ff49da645a567567ba;hp=39a6692f2b228df76f4274e25abc139397a58b8a;hpb=d55f78661cd9bd77609beed2552d7dd6262ad65c;p=d2df-sdl.git

diff --git a/src/game/g_map.pas b/src/game/g_map.pas
index 39a6692..2b8e9ff 100644
--- a/src/game/g_map.pas
+++ b/src/game/g_map.pas
@@ -3169,6 +3169,7 @@ end;
 procedure g_Map_DrawFlags();
 var
   i, dx: Integer;
+  tx, ty: Integer;
   Mirror: TMirrorType;
 begin
   if gGameSettings.GameMode <> GM_CTF then
@@ -3181,6 +3182,8 @@ begin
         if State = FLAG_STATE_NONE then
           continue;
 
+        Obj.lerp(gLerpFactor, tx, ty);
+
         if Direction = TDirection.D_LEFT then
           begin
             Mirror := TMirrorType.Horizontal;
@@ -3192,7 +3195,7 @@ begin
             dx := 1;
           end;
 
-        Animation.Draw(Obj.X+dx, Obj.Y+1, Mirror);
+        Animation.Draw(tx+dx, ty+1, Mirror);
 
         if g_debug_Frames then
         begin
@@ -3269,9 +3272,9 @@ begin
   if gGameSettings.GameMode in [GM_TDM, GM_CTF] then
   begin
     // Î÷êè Êðàñíîé êîìàíäû
-    utils.writeInt(st, SmallInt(gTeamStat[TEAM_RED].Goals));
+    utils.writeInt(st, SmallInt(gTeamStat[TEAM_RED].Score));
     // Î÷êè Ñèíåé êîìàíäû
-    utils.writeInt(st, SmallInt(gTeamStat[TEAM_BLUE].Goals));
+    utils.writeInt(st, SmallInt(gTeamStat[TEAM_BLUE].Score));
   end;
   ///// /////
 end;
@@ -3361,9 +3364,9 @@ begin
   if gGameSettings.GameMode in [GM_TDM, GM_CTF] then
   begin
     // Î÷êè Êðàñíîé êîìàíäû
-    gTeamStat[TEAM_RED].Goals := utils.readSmallInt(st);
+    gTeamStat[TEAM_RED].Score := utils.readSmallInt(st);
     // Î÷êè Ñèíåé êîìàíäû
-    gTeamStat[TEAM_BLUE].Goals := utils.readSmallInt(st);
+    gTeamStat[TEAM_BLUE].Score := utils.readSmallInt(st);
   end;
   ///// /////
 end;