Changeset 486 for trunk/LocalPlayer/Select.pas

Timestamp:

Dec 8, 2023, 8:25:31 PM (11 months ago)

Author:

chronos

Message:

• Modified: Code cleanup.

File:

• trunk/LocalPlayer/Select.pas (modified) (5 diffs)

trunk/LocalPlayer/Select.pas

@@ -238 +238 @@
 
 var
-  icon, ofs, X, Y, y0, lix, I, J, TextColor, Available, first, Test,
-    FutureCount, growth, TrueFood, TrueProd: Integer;
+  icon, ofs, X, Y, y0, lix, I, J, TextColor, Available, First, Test,
+    FutureCount, Growth, TrueFood, TrueProd: Integer;
   CityReport: TCityReportNew;
   mox: ^TModelInfo;
@@ -253 +253 @@
 
   if Kind in [kCities, kCityEvents] then
-    with MyCity[lix] do
+    with TCity(MyCity[lix]) do
     begin
       X := 104 - 76;
@@ -281 +281 @@
           Font.Color := $000000;
           S := IntToStr(MyCity[lix].Size);
-          TextOut(X - 4 - textwidth(S) div 2, Y, S);
+          TextOut(X - 4 - TextWidth(S) div 2, Y, S);
         end;
 
@@ -402 +402 @@
             ((Size < NeedAqueductSize) or (Built[imAqueduct] = 1) and
             (Size < NeedSewerSize) or (Built[imSewer] = 1));
+          Growth := CutCityFoodSurplus(CityReport.FoodSurplus,
+            (MyRO.Government <> gAnarchy) and (Flags and chCaptured = 0),
+            MyRO.Government, Size);
           PaintRelativeProgressBar(Offscreen.Canvas, 1, X + 15 + CityNameSpace +
-            4, Y + 7, 68, TrueFood, CutCityFoodSurplus(CityReport.FoodSurplus,
-            (MyRO.Government <> gAnarchy) and (Flags and chCaptured = 0),
-            MyRO.Government, Size), CityReport.Storage, CanGrow, MainTexture);
+            4, Y + 7, 68, TrueFood, Growth, CityReport.Storage, CanGrow, MainTexture);
 
           if Project <> cpImp + imTrGoods then
@@ -413 +414 @@
 
             // production progress
-            growth := CityReport.Production;
-            if (growth < 0) or (MyRO.Government = gAnarchy) or
+            Growth := CityReport.Production;
+            if (Growth < 0) or (MyRO.Government = gAnarchy) or
               (Flags and chCaptured <> 0) then
-              growth := 0;
+              Growth := 0;
             PaintRelativeProgressBar(Offscreen.Canvas, 4,
-              X + CityNameSpace + 4 + 304 - 60 + 9, Y + 7, 68, TrueProd, growth,
+              X + CityNameSpace + 4 + 304 - 60 + 9, Y + 7, 68, TrueProd, Growth,
               CityReport.ProjectCost, True, MainTexture);
           end;