Changeset 205 for trunk

Timestamp:

May 8, 2020, 4:54:17 PM (5 years ago)

Author:

chronos

Message:

• Fixed: Removed various code compilation warnings and hints.

Location:

trunk

Files:

• CityProcessing.pas (modified) (2 diffs)
• GameServer.pas (modified) (3 diffs)
• LocalPlayer/Battle.pas (modified) (1 diff)
• LocalPlayer/CityScreen.pas (modified) (1 diff)
• LocalPlayer/ClientTools.pas (modified) (1 diff)
• LocalPlayer/Help.pas (modified) (1 diff)
• LocalPlayer/Select.pas (modified) (1 diff)
• LocalPlayer/TechTree.pas (modified) (2 diffs)
• LocalPlayer/Term.pas (modified) (2 diffs)
• Locale.pas (modified) (1 diff)
• Packages/CevoComponents/DrawDlg.pas (modified) (2 diffs)
• Packages/CevoComponents/ScreenTools.pas (modified) (1 diff)
• Packages/CevoComponents/Sound.pas (modified) (1 diff)

trunk/CityProcessing.pas

@@ -630 +630 @@
   TileInfo: TTileInfo;
 begin
+  BestDist := MaxInt;
 {$IFOPT O-}assert(1 shl p and InvalidTreatyMap = 0); {$ENDIF}
   Best := 0;
@@ -660 +661 @@
               result := Loc1;
               Best := Resources;
-              BestDist := Dist
-            end
-          end
-        end
-      end;
-  end
+              BestDist := Dist;
+            end;
+          end;
+        end;
+      end;
+  end;
 end;
 

trunk/GameServer.pas

@@ -7 +7 @@
 
 uses
-  Protocol, Database, dynlibs, Platform, dateutils, fgl, FileUtil, Graphics;
+  Protocol, Database, dynlibs, Platform, dateutils, fgl, LazFileUtils, Graphics;
 
 const
@@ -2700 +2700 @@
   end;
 
-const
-  Dirx: array [0 .. 7] of integer = (1, 2, 1, 0, -1, -2, -1, 0);
-  Diry: array [0 .. 7] of integer = (-1, 0, 1, 2, 1, 0, -1, -2);
-
 var
   d, i, j, p1, p2, pt0, pt1, uix1, cix1, Loc0, Loc1, dx, dy, NewCap, MinCap,
@@ -2709 +2705 @@
     StopTurn, FutureMCost, NewProject, OldImp, mix, V8, V21, AStr, DStr,
     ABaseDamage, DBaseDamage: integer;
-  CityReport, AltCityReport: TCityReport;
+  CityReport: TCityReport;
   FormerCLState: TCmdListState;
-  EndTime: int64;
   Adjacent: TVicinity8Loc;
   Radius: TVicinity21Loc;

trunk/LocalPlayer/Battle.pas

@@ -5 +5 @@
 
 uses
-  ScreenTools, Protocol, Messg, ButtonBase, ButtonA, Types, LCLIntf, LCLType,
+  ScreenTools, Protocol, ButtonBase, ButtonA, Types, LCLIntf, LCLType,
   SysUtils, Classes, Graphics, Controls, Forms, DrawDlg;
 

trunk/LocalPlayer/CityScreen.pas

@@ -498 +498 @@
 
 var
-  x, y, xGr, i, i1, j, iix, d, dx, dy, PrCost, Cnt, Loc1, FreeSupp, Paintiix,
+  x, y, xGr, i, j, iix, d, dx, dy, PrCost, Cnt, Loc1, FreeSupp, Paintiix,
     HappyGain, OptiType, rx, ry, TrueFood, TrueProd, TruePoll: integer;
   av: integer;

trunk/LocalPlayer/ClientTools.pas

@@ -695 +695 @@
 initialization
 
-assert(nImp < 128);
+Assert(nImp < 128);
 CalculateAdvValues;
 

trunk/LocalPlayer/Help.pas

@@ -6 +6 @@
 uses
   Protocol, ScreenTools, BaseWin, StringTables, Math, LCLIntf, LCLType,
-  LMessages, Messages, SysUtils, Classes, Graphics, Controls, Forms, ExtCtrls,
+  Messages, SysUtils, Classes, Graphics, Controls, Forms, ExtCtrls,
   ButtonB, PVSB, Types, fgl;
 

trunk/LocalPlayer/Select.pas

@@ -7 +7 @@
   Protocol, ClientTools, Term, ScreenTools, IsoEngine, PVSB, BaseWin,
 
-  LCLIntf, LCLType, LMessages, Messages, SysUtils, Classes, Graphics, Controls, Forms,
+  LCLIntf, LCLType, Messages, SysUtils, Classes, Graphics, Controls, Forms,
   ExtCtrls, ButtonB, ButtonBase, Menus, Types;
 

trunk/LocalPlayer/TechTree.pas

@@ -5 +5 @@
 
 uses
-  ScreenTools, Messg, LCLIntf, LCLType, Messages, SysUtils, Classes, Graphics,
-  Controls, Forms, ButtonBase, ButtonB, DrawDlg;
+  ScreenTools, LCLIntf, LCLType, SysUtils, Classes, Graphics,
+  Controls, Forms, ButtonB, DrawDlg;
 
 type
@@ -34 +34 @@
 
 uses
-  Directories, PixelPointer;
+  Directories;
 
 {$R *.lfm}

trunk/LocalPlayer/Term.pas

@@ -1629 +1629 @@
     (Adv: adSpaceFlight; Icon: woMIR));
 var
-  Domain, p1, i, ad, uix, cix, MoveOptions, MoveResult, Loc1, Dist,
-    NewAgeCenterTo, Bankrupt, ShipMore, Winners, NewGovAvailable, dx,
+  p1, i, ad, uix, cix, MoveOptions, MoveResult, Loc1,
+    NewAgeCenterTo, Winners, NewGovAvailable, dx,
     dy: integer;
   MoveAdviceData: TMoveAdviceData;
@@ -6008 +6008 @@
 var
   ToLoc, xFromLoc, yFromLoc, xToLoc, yToLoc, xFrom, yFrom, xTo, yTo, xMin, yMin,
-    xRange, yRange, xw1, Step, xMoving, yMoving, yl, SliceCount: integer;
+    xRange, yRange, xw1, Step, xMoving, yMoving, SliceCount: integer;
   UnitInfo: TUnitInfo;
   Ticks0, Ticks: TDateTime;

trunk/Locale.pas

@@ -128 +128 @@
 var
   S: string;
-  W: Integer;
 begin
   PaintBackground(self, 3, 3, ClientWidth - 6, ClientHeight - 6);

trunk/Packages/CevoComponents/DrawDlg.pas

@@ -6 +6 @@
 
 uses
-  Classes, SysUtils, Forms, LCLIntf, LCLType, LMessages, Messages, Graphics,
-  Controls, ButtonBase, ButtonA, ButtonB, Area, ScreenTools;
+  Classes, SysUtils, Forms, LCLIntf, LCLType, {$IFDEF LINUX}LMessages,{$ENDIF}
+  Messages, Graphics, Controls, ButtonBase, ButtonA, ButtonB, Area, ScreenTools;
 
 type
@@ -119 +119 @@
 procedure TDrawDlg.MouseDown(Button: TMouseButton; Shift: TShiftState; X,
   Y: Integer);
+{$IFDEF LINUX}
 var
   MousePosNew: TPoint;
   NewFormPos: TPoint;
+{$ENDIF}
 begin
   inherited;

trunk/Packages/CevoComponents/ScreenTools.pas

@@ -208 +208 @@
 
 uses
-  Directories, Sound, Registry, PixelPointer;
+  Directories, Sound, PixelPointer;
 
 var

trunk/Packages/CevoComponents/Sound.pas

@@ -4 +4 @@
 
 uses
-  Messages, SysUtils, Classes, Graphics, Controls, Forms, fgl, FileUtil,
+  SysUtils, Classes, Graphics, Controls, Forms, fgl, FileUtil,
   StringTables, Directories
   {$IFDEF WINDOWS}, MMSystem, Windows{$ENDIF}
-  {$IFDEF LINUX}, Process, AsyncProcess{$ENDIF};
+  {$IFDEF LINUX}, Messages, Process, AsyncProcess{$ENDIF};
 
 type