Changeset 325 for trunk/LocalPlayer/CityScreen.pas

Timestamp:

Mar 23, 2021, 10:49:30 PM (3 years ago)

Author:

chronos

Message:

• Modified: Code cleanup.

File:

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

trunk/LocalPlayer/CityScreen.pas

@@ -5 +5 @@
 
 uses
-  {$IFDEF LINUX}
-  LMessages,
-  {$ENDIF}
+  {$IFDEF LINUX}LMessages,{$ENDIF}
   Protocol, ClientTools, Term, ScreenTools, IsoEngine, BaseWin,
   LCLIntf, LCLType, Messages, SysUtils, Classes, Graphics, Controls, Forms, ExtCtrls,
@@ -53 +51 @@
     procedure PageUpBtnClick(Sender: TObject);
     procedure PageDownBtnClick(Sender: TObject);
-
+  private
+    c: TCity;
+    Report: TCityReportNew;
+    cOwner: Integer;
+    cGov: Integer;
+    emix: Integer; { enemy model index of produced unit }
+    cix: Integer;
+    cLoc: Integer;
+    Mode: Integer;
+    ZoomArea: Integer;
+    Page: Integer;
+    PageCount: Integer;
+    BlinkTime: Integer;
+    OpenSoundEvent: Integer;
+    SizeClass: Integer;
+    AgePrepared: Integer;
+    Optimize_cixTileChange: Integer;
+    Optimize_TilesBeforeChange: Integer;
+    Happened: cardinal;
+    imix: array [0 .. 15] of integer;
+    CityAreaInfo: TCityAreaInfo;
+    AreaMap: TIsoMap;
+    CityMapTemplate: TBitmap;
+    SmallCityMapTemplate: TBitmap;
+    Back: TBitmap;
+    SmallCityMap: TBitmap;
+    ZoomCityMap: TBitmap;
+    Template: TBitmap;
+    IsPort: Boolean;
+    ProdHint: Boolean;
+    AllowChange: Boolean;
+    procedure InitSmallCityMap;
+    procedure InitZoomCityMap;
+    procedure ChooseProject;
+    procedure ChangeCity(d: integer);
+    procedure ChangeResourceWeights(iResourceWeights: integer);
+    procedure OnPlaySound(var Msg: TMessage); message WM_PLAYSOUND;
   public
     RestoreUnFocus: integer;
@@ -61 +95 @@
     procedure Reset;
     procedure CheckAge;
-
-  private
-    c: TCity;
-    Report: TCityReportNew;
-    cOwner, cGov, emix { enemy model index of produced unit } , cix, cLoc, Mode,
-      ZoomArea, Page, PageCount, BlinkTime, OpenSoundEvent, SizeClass,
-      AgePrepared: integer;
-    Optimize_cixTileChange, Optimize_TilesBeforeChange: integer;
-    Happened: cardinal;
-    imix: array [0 .. 15] of integer;
-    CityAreaInfo: TCityAreaInfo;
-    AreaMap: TIsoMap;
-    CityMapTemplate, SmallCityMapTemplate, Back, SmallCityMap, ZoomCityMap,
-      Template: TBitmap;
-    IsPort, ProdHint, AllowChange: boolean;
-    procedure InitSmallCityMap;
-    procedure InitZoomCityMap;
-    procedure ChooseProject;
-    procedure ChangeCity(d: integer);
-    procedure ChangeResourceWeights(iResourceWeights: integer);
-    procedure OnPlaySound(var Msg: TMessage); message WM_PLAYSOUND;
   end;
 
@@ -87 +100 @@
   CityDlg: TCityDlg;
 
+
 implementation
 
 uses
-  Select, Messg, MessgEx, Help, Tribes, Directories, Math, UPixelPointer, Sound;
+  Select, Messg, MessgEx, Help, Tribes, Directories, Math, Sound;
 
 {$R *.lfm}
@@ -278 +292 @@
     c := MyCity[cix];
   case MyMap[cLoc] and fTerrain of
-    fPrairie:
-      cli1 := cliPrairie;
-    fHills:
-      cli1 := cliHills;
-    fTundra:
-      cli1 := cliTundra;
+    fPrairie: cli1 := cliPrairie;
+    fHills: cli1 := cliHills;
+    fTundra: cli1 := cliTundra;
   else
     cli1 := cliPlains;
@@ -1340 +1351 @@
                 not csResourceWeightsMask; // off
               c.Status := MyCity[cix].Status;
-              SmartUpdateContent
+              SmartUpdateContent;
             end;
             exit;
@@ -1737 +1748 @@
   begin
     dec(Page);
-    SmartUpdateContent
+    SmartUpdateContent;
   end;
 end;
@@ -1746 +1757 @@
   begin
     inc(Page);
-    SmartUpdateContent
+    SmartUpdateContent;
   end;
 end;