Changeset 486 for trunk

Timestamp:

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

Author:

chronos

Message:

• Modified: Code cleanup.

Location:

trunk

Files:

• AI/StdAI/AI.pas (modified) (1 diff)
• AI/StdAI/Barbarina.pas (modified) (1 diff)
• AI/StdAI/Pile.pas (modified) (5 diffs)
• LocalPlayer/ClientTools.pas (modified) (4 diffs)
• LocalPlayer/IsoEngine.pas (modified) (3 diffs)
• LocalPlayer/Select.pas (modified) (5 diffs)
• LocalPlayer/Term.pas (modified) (2 diffs)
• Packages/CevoComponents/ScreenTools.pas (modified) (3 diffs)

trunk/AI/StdAI/AI.pas

@@ -2566 +2566 @@
       if (Loc >= 0) and (Flags and chCaptured = 0) and (District[Loc] >= 0) then
       begin
-        if size < 4 then
+        if Size < 4 then
           City_OptimizeTiles(cix, rwMaxGrowth)
         else

trunk/AI/StdAI/Barbarina.pas

@@ -1431 +1431 @@
             (iix = imShipComp) or (iix = imShipPow) or (iix = imShipHab) then
             City_OptimizeTiles(cix, rwMaxProd)
-          else if size < 8 then
+          else if Size < 8 then
             City_OptimizeTiles(cix, rwMaxGrowth)
           else

trunk/AI/StdAI/Pile.pas

@@ -43 +43 @@
   if (N <> 0) or (Size > CurrentSize) then
   begin
-    FillChar(Ix, Size * sizeOf(Integer), 255);
+    FillChar(Ix, Size * SizeOf(Integer), 255);
     N := 0;
   end;
   CurrentSize := Size;
-        {$IFDEF DEBUG}
+{$IFDEF DEBUG}
   InUse := True;
 {$ENDIF}
@@ -54 +54 @@
 procedure Free;
 begin
-        {$IFDEF DEBUG}
+{$IFDEF DEBUG}
   Assert(InUse);
   InUse := False;
@@ -64 +64 @@
   if N <> 0 then
   begin
-    FillChar(Ix, CurrentSize * sizeOf(Integer), 255);
+    FillChar(Ix, CurrentSize * SizeOf(Integer), 255);
     N := 0;
   end;
 end;
 
-//Parent(i) = (i-1)/2.
-function Put(Item, Value: Integer): Boolean; //O(lg(n))
+// Parent(i) = (i-1)/2.
+function Put(Item, Value: Integer): Boolean; // O(lg(n))
 var
   I, J: Integer;
@@ -92 +92 @@
   while I > 0 do
   begin
-    J := (I - 1) shr 1;  //Parent(i) = (i-1)/2
+    J := (I - 1) shr 1;  // Parent(i) = (i-1)/2
     if Value >= bh[J].Value then
       Break;
@@ -99 +99 @@
     I := J;
   end;
-  //  Insert the new Item at the insertion point found.
+  // Insert the new Item at the insertion point found.
   bh[I].Value := Value;
   bh[I].Item := Item;

trunk/LocalPlayer/ClientTools.pas

@@ -57 +57 @@
 function IsMilReportNew(Enemy: Integer): Boolean;
 function CutCityFoodSurplus(FoodSurplus: Integer; IsCityAlive: Boolean;
-  gov, size: Integer): Integer;
+  gov, Size: Integer): Integer;
 function CityTaxBalance(cix: Integer; const CityReport: TCityReportNew): Integer;
 procedure SumCities(var TaxSum, ScienceSum: Integer);
@@ -233 +233 @@
 
 function CutCityFoodSurplus(FoodSurplus: Integer; IsCityAlive: Boolean;
-  gov, size: Integer): Integer;
+  gov, Size: Integer): Integer;
 begin
   Result := FoodSurplus;
   if not IsCityAlive or (Result > 0) and ((gov = gFuture) or
-    (size >= NeedAqueductSize) and (Result < 2)) then
+    (Size >= NeedAqueductSize) and (Result < 2)) then
     Result := 0; { no growth }
 end;
@@ -253 +253 @@
       (CityReport.Production > 0) then
       Inc(Result, CityReport.Production);
-    if ((MyRO.Government = gFuture) or (MyCity[cix].size >=
+    if ((MyRO.Government = gFuture) or (MyCity[cix].Size >=
       NeedAqueductSize) and (CityReport.FoodSurplus < 2)) and
       (CityReport.FoodSurplus > 0) then
@@ -330 +330 @@
       Owner := Me;
       ID := MyCity[cix].ID;
-      size := MyCity[cix].size;
+      Size := MyCity[cix].Size;
       Flags := 0;
       if MyCity[cix].Built[imPalace] > 0 then

trunk/LocalPlayer/IsoEngine.pas

@@ -193 +193 @@
 begin
   // prepare age 2+3 cities
-  for age := 2 to 3 do
-    for size := 0 to 3 do
+  for Age := 2 to 3 do
+    for Size := 0 to 3 do
       with Pictures[Age, Size] do
         FindPosition(HGrCities, Size * (xxt * 2 + 1), (Age - 2) * (yyt * 3 + 1),
@@ -738 +738 @@
 begin
   Age := GetAge(CityInfo.Owner);
-  if CityInfo.size < 5 then
+  if CityInfo.Size < 5 then
     xGr := 0
-  else if CityInfo.size < 9 then
+  else if CityInfo.Size < 9 then
     xGr := 1
-  else if CityInfo.size < 13 then
+  else if CityInfo.Size < 13 then
     xGr := 2
   else
@@ -793 +793 @@
       yShield := Y - 2 * yyt + cpic.yShield;
     end;
-    S := IntToStr(CityInfo.size);
+    S := IntToStr(CityInfo.Size);
     LabelLength := FOutput.Canvas.TextWidth(S);
     FillRect(xShield, yShield, LabelLength + 4, 16, $000000);

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;

trunk/LocalPlayer/Term.pas

@@ -765 +765 @@
 
 procedure ChooseModelPicture(P, mix, Code, Hash, Turn: Integer;
-  ForceNew, final: Boolean);
+  ForceNew, Final: Boolean);
 var
   I: Integer;
@@ -796 +796 @@
     IsNew := Tribe[P].ChooseModelPicture(Picture, Code, Turn, ForceNew);
   end;
-  if final then
+  if Final then
     if not TribeOriginal[P] then
       Tribe[P].SetModelPicture(Picture, IsNew)

trunk/Packages/CevoComponents/ScreenTools.pas

@@ -92 +92 @@
   T: TTexture);
 procedure PaintRelativeProgressBar(Canvas: TCanvas;
-  Kind, X, Y, size, Pos, Growth, Max: Integer; IndicateComplete: Boolean;
+  Kind, X, Y, Size, Pos, Growth, Max: Integer; IndicateComplete: Boolean;
   T: TTexture);
 procedure PaintLogo(Canvas: TCanvas; X, Y, LightColor, ShadeColor: Integer);
@@ -1534 +1534 @@
     end;
     Brush.Color := $000000;
-    FillRect(Rect(X + Pos + abs(Growth), Y, X + Max, Y + 7));
+    FillRect(Rect(X + Pos + Abs(Growth), Y, X + Max, Y + 7));
     Brush.Style := TBrushStyle.bsClear;
   end;
@@ -1541 +1541 @@
 // pos and growth are relative to max, set size independent
 procedure PaintRelativeProgressBar(Canvas: TCanvas;
-  Kind, X, Y, size, Pos, Growth, Max: Integer; IndicateComplete: Boolean;
+  Kind, X, Y, Size, Pos, Growth, Max: Integer; IndicateComplete: Boolean;
   T: TTexture);
 begin
   if Growth > 0 then
-    PaintProgressBar(Canvas, Kind, X, Y, Pos * size div Max,
-      (Growth * size + Max div 2) div Max, size, T)
+    PaintProgressBar(Canvas, Kind, X, Y, Pos * Size div Max,
+      (Growth * Size + Max div 2) div Max, Size, T)
   else
-    PaintProgressBar(Canvas, Kind, X, Y, Pos * size div Max,
-      (Growth * size - Max div 2) div Max, size, T);
+    PaintProgressBar(Canvas, Kind, X, Y, Pos * Size div Max,
+      (Growth * Size - Max div 2) div Max, Size, T);
   if IndicateComplete and (Pos + Growth >= Max) then
-    Sprite(Canvas, HGrSystem, X + size - 10, Y - 7, 23, 16, 1, 129);
+    Sprite(Canvas, HGrSystem, X + Size - 10, Y - 7, 23, 16, 1, 129);
 end;