Changeset 325 for trunk/LocalPlayer/IsoEngine.pas

Timestamp:

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

Author:

chronos

Message:

• Modified: Code cleanup.

File:

• trunk/LocalPlayer/IsoEngine.pas (modified) (10 diffs)

trunk/LocalPlayer/IsoEngine.pas

@@ -15 +15 @@
   TIsoMap = class
   private
+    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);
     procedure CityGrid(xm, ym: integer; CityAllowClick: Boolean);
     function IsShoreTile(Loc: integer): boolean;
@@ -753 +756 @@
       (MyMap[dLoc(Loc, -2, 2)] and fObserved <> 0) and
       (MyMap[dLoc(Loc, 2, 2)] and fObserved <> 0) then
-      result := result or fObserved
+      result := result or fObserved;
   end
   else if Loc < 0 then
@@ -762 +765 @@
     if (MyMap[dLoc(Loc, -1, 1)] and fObserved <> 0) and
       (MyMap[dLoc(Loc, 1, 1)] and fObserved <> 0) then
-      result := result or fObserved
+      result := result or fObserved;
   end
   else if Loc < G.lx * (G.ly + 1) then
@@ -771 +774 @@
     if (MyMap[dLoc(Loc, -1, -1)] and fObserved <> 0) and
       (MyMap[dLoc(Loc, 1, -1)] and fObserved <> 0) then
-      result := result or fObserved
+      result := result or fObserved;
   end
   else if Loc < G.lx * (G.ly + 2) then
@@ -782 +785 @@
       (MyMap[dLoc(Loc, -2, -2)] and fObserved <> 0) and
       (MyMap[dLoc(Loc, 2, -2)] and fObserved <> 0) then
-      result := result or fObserved
-  end
-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);
+      result := result or fObserved;
+  end;
+end;
 
 function TIsoMap.Connection4(Loc, Mask, Value: integer): integer;
@@ -811 +810 @@
 function TIsoMap.Connection8(Loc, Mask: integer): integer;
 var
-  Dir, ConnLoc: integer;
+  Dir: Integer;
+  ConnLoc: Integer;
 begin
   result := 0;
@@ -825 +825 @@
 function TIsoMap.OceanConnection(Loc: integer): integer;
 var
-  Dir, ConnLoc: integer;
+  Dir: Integer;
+  ConnLoc: Integer;
 begin
   result := 0;
@@ -839 +840 @@
 procedure TIsoMap.PaintShore(x, y, Loc: integer);
 var
-  Conn, Tile: integer;
+  Conn: Integer;
+  Tile: Integer;
 begin
   if (y <= FTop - yyt * 2) or (y > FBottom) or (x <= FLeft - xxt * 2) or
@@ -1333 +1335 @@
 
 function TIsoMap.IsShoreTile(Loc: integer): boolean;
-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
-  Dir, ConnLoc: integer;
+var
+  Dir: Integer;
+  ConnLoc: integer;
 begin
   result := false;
@@ -1345 +1345 @@
     if (ConnLoc < 0) or (ConnLoc >= G.lx * G.ly) or
       ((MyMap[ConnLoc] - 2) and fTerrain < 13) then
-      result := true
-  end
+      result := true;
+  end;
 end;