Changeset 417 for trunk/LocalPlayer/CityScreen.pas

Timestamp:

Nov 17, 2021, 11:11:01 AM (2 years ago)

Author:

chronos

Message:

• Modified: Merged LoadGraphicSet and LoadGraphicSet2 into single method.
• Modified: Moved brain load picture code into TBrain.LoadPicture method.
• Added: Brain pictures loaded as TGraphicSetItem.
• Modified: Code cleanup.

File:

• trunk/LocalPlayer/CityScreen.pas (modified) (17 diffs)

trunk/LocalPlayer/CityScreen.pas

@@ -93 +93 @@
     procedure OnPlaySound(var Msg: TMessage); message WM_PLAYSOUND;
   public
-    RestoreUnFocus: integer;
+    RestoreUnFocus: Integer;
     CloseAction: TCityCloseAction;
     procedure OffscreenPaint; override;
@@ -148 +148 @@
   wZoomEnvironment = 68;
 
-  ImpPosition: array [28 .. nImp - 1] of integer = (-1, // imTrGoods
+  ImpPosition: array [28 .. nImp - 1] of Integer = (
+    -1, // imTrGoods
     21, // imBarracks
     6, // imGranary
@@ -192 +193 @@
 
 var
-  ImpSorted: array [0 .. nImp - 1] of integer;
+  ImpSorted: array [0 .. nImp - 1] of Integer;
 
 procedure TCityDlg.FormCreate(Sender: TObject);
@@ -206 +207 @@
   SmallMapMode := smImprovements;
   ZoomArea := 1;
-  ProdHint := false;
+  ProdHint := False;
   RestoreUnFocus := -1;
   OpenSoundEvent := -1;
@@ -489 +490 @@
 var
   x, y, xGr, i, j, iix, d, dx, dy, PrCost, Cnt, Loc1, FreeSupp, Paintiix,
-    HappyGain, OptiType, rx, ry, TrueFood, TrueProd, TruePoll: integer;
-  av: integer;
+    HappyGain, OptiType, rx, ry, TrueFood, TrueProd, TruePoll: Integer;
+  av: Integer;
   PrName, s: string;
   UnitInfo: TUnitInfo;
   UnitReport: TUnitReport;
-  IsCityAlive, CanGrow: boolean;
+  IsCityAlive, CanGrow: Boolean;
 begin
   inherited;
@@ -509 +510 @@
   TrueProd := c.Prod;
   TruePoll := c.Pollution;
-  if supervising or (cix < 0) then
+  if Supervising or (cix < 0) then
   begin // normalize city from after-turn state
-    dec(TrueFood, Report.FoodSurplus);
+    Dec(TrueFood, Report.FoodSurplus);
     if TrueFood < 0 then
       TrueFood := 0; // shouldn't happen
-    dec(TrueProd, Report.Production);
+    Dec(TrueProd, Report.Production);
     if TrueProd < 0 then
       TrueProd := 0; // shouldn't happen
-    dec(TruePoll, Report.AddPollution);
+    Dec(TruePoll, Report.AddPollution);
     if TruePoll < 0 then
       TruePoll := 0; // shouldn't happen
@@ -534 +535 @@
 
   Offscreen.Canvas.Font.Assign(UniFont[ftCaption]);
-  RisedTextOut(offscreen.Canvas, 42, 7, Caption);
-  with offscreen.Canvas do
+  RisedTextOut(Offscreen.Canvas, 42, 7, Caption);
+  with Offscreen.Canvas do
   begin // city size
-    brush.Color := $000000;
+    Brush.Color := $000000;
     FillRect(Rect(8 + 1, 7 + 1, 36 + 1, 32 + 1));
-    brush.Color := $FFFFFF;
+    Brush.Color := $FFFFFF;
     FillRect(Rect(8, 7, 36, 32));
-    brush.style := bsClear;
+    Brush.style := bsClear;
     Font.Color := $000000;
-    s := inttostr(c.Size);
-    TextOut(8 + 14 - textwidth(s) div 2, 7, s);
+    s := IntToStr(c.Size);
+    TextOut(8 + 14 - TextWidth(s) div 2, 7, s);
   end;
   Offscreen.Canvas.Font.Assign(UniFont[ftSmall]);
@@ -959 +960 @@
           end // unit visible in display
           else
-            dec(FreeSupp, UnitReport.ProdSupport);
-          inc(Cnt);
+            Dec(FreeSupp, UnitReport.ProdSupport);
+          Inc(Cnt);
         end;
     PageCount := (Cnt + 5) div 6;
@@ -973 +974 @@
   PageDownBtn.Visible := PageCount > 1;
 
-  with offscreen.Canvas do
+  with Offscreen.Canvas do
   begin
     { display project now }
@@ -1067 +1068 @@
     end;
 
-    NextCityBtn.Visible := false;
-    PrevCityBtn.Visible := false;
+    NextCityBtn.Visible := False;
+    PrevCityBtn.Visible := False;
   end;
   Page := 0;
@@ -1082 +1083 @@
 
   // check if port
-  IsPort := false;
+  IsPort := False;
   for dx := -2 to 2 do
     for dy := -2 to 2 do
-      if abs(dx) + abs(dy) = 2 then
+      if Abs(dx) + Abs(dy) = 2 then
       begin
         Loc1 := dLoc(cLoc, dx, dy);
         if (Loc1 >= 0) and (Loc1 < G.lx * G.ly) and
           (MyMap[Loc1] and fTerrain < fGrass) then
-          IsPort := true;
+          IsPort := True;
       end;
 
@@ -1105 +1106 @@
   OpenSoundEvent := -1;
   OffscreenPaint;
-  Timer1.Enabled := true;
+  Timer1.Enabled := True;
 end;
 
@@ -1152 +1153 @@
     InitZoomCityMap;
     SmartUpdateContent;
-    exit;
+    Exit;
   end;
   if (ssLeft in Shift) and (x >= xSupport) and (x < xSupport + wSupport) and
@@ -1161 +1162 @@
     InitZoomCityMap;
     SmartUpdateContent;
-    exit;
+    Exit;
   end;
   if not AllowChange then
-    exit; // not an own city
+    Exit; // Not an own city
 
   if (ssLeft in Shift) then
@@ -1585 +1586 @@
 procedure TCityDlg.FormClose(Sender: TObject; var Action: TCloseAction);
 begin
-  Timer1.Enabled := false;
-  ProdHint := false;
+  Timer1.Enabled := False;
+  ProdHint := False;
   MarkCityLoc := -1;
   if Optimize_cixTileChange >= 0 then
@@ -1751 +1752 @@
   if Page > 0 then
   begin
-    dec(Page);
+    Dec(Page);
     SmartUpdateContent;
   end;
@@ -1760 +1761 @@
   if Page < PageCount - 1 then
   begin
-    inc(Page);
+    Inc(Page);
     SmartUpdateContent;
   end;