Changeset 549 for trunk/LocalPlayer/IsoEngine.pas

Timestamp:

Apr 21, 2024, 8:55:53 PM (7 months ago)

Author:

chronos

Message:

• Modified: Optimize code with earlier break from for cycle evaluating boolean result.
• Modified: Code cleanup.

File:

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

trunk/LocalPlayer/IsoEngine.pas

@@ -39 +39 @@
     function IsShoreTile(Loc: Integer): Boolean;
     procedure MakeDark(Line: PPixelPointer; Length: Integer);
+    procedure NameCity(X, Y, Loc: Integer);
+    procedure PaintBorder(X, Y, Loc, Tile: Integer);
+    function PoleTile(Loc: Integer): Integer;
     procedure SetTileSize(AValue: TTileSize);
     procedure ShadeOutside(x0, y0, Width, Height, xm, ym: Integer);
+    procedure ShowSpacePort(X, Y, Tile: Integer; CityInfo: TCityInfo);
   protected
     FOutput: TBitmap;
@@ -803 +807 @@
 end;
 
-function PoleTile(Loc: Integer): Integer;
+function TIsoMap.PoleTile(Loc: Integer): Integer;
 begin { virtual pole tile }
   Result := fUNKNOWN;
@@ -1047 +1051 @@
 end;
 
+procedure TIsoMap.NameCity(X, Y, Loc: Integer);
+var
+  cix, xs, W: Integer;
+  BehindCityInfo: TCityInfo;
+  S: string;
+  IsCapital: Boolean;
+begin
+  BehindCityInfo.Loc := Loc - 2 * G.lx;
+  if ShowCityNames and not (moEditMode in MapOptions) and
+    (BehindCityInfo.Loc >= 0) and (BehindCityInfo.Loc < G.lx * G.ly) and
+    (MyMap[BehindCityInfo.Loc] and fCity <> 0) then
+  begin
+    GetCityInfo(BehindCityInfo.Loc, cix, BehindCityInfo);
+    IsCapital := BehindCityInfo.Flags and ciCapital <> 0;
+    { if Showuix and (cix>=0) then s:=IntToStr(cix)
+      else } S := CityName(BehindCityInfo.ID);
+    W := FOutput.Canvas.TextWidth(S);
+    xs := X + xxt - (W + 1) div 2;
+    if IsCapital then
+      FOutput.Canvas.Font.Style := FOutput.Canvas.Font.Style + [TFontStyle.fsUnderline];
+    TextOut(xs + 1, Y - 9, $000000, S);
+    TextOut(xs, Y - 10, $FFFFFF, S);
+    if IsCapital then
+      FOutput.Canvas.Font.Style := FOutput.Canvas.Font.Style - [TFontStyle.fsUnderline];
+  end;
+end;
+
+procedure TIsoMap.PaintBorder(X, Y, Loc, Tile: Integer);
+var
+  dx, dy: Integer;
+  p1, p2, Loc1: Integer;
+begin
+  if ShowBorder and (Loc >= 0) and (Loc < G.lx * G.ly) and
+    (Tile and fTerrain <> fUNKNOWN) then begin
+    p1 := MyRO.Territory[Loc];
+    if (p1 >= 0) and (ShowMyBorder or (p1 <> Me)) then begin
+      if BordersOK^ and (1 shl p1) = 0 then begin
+        UnshareBitmap(Borders);
+        BitBltBitmap(Borders, 0, p1 * (yyt * 2), xxt * 2,
+          yyt * 2, HGrTerrain.Data,
+          1 + 8 * (xxt * 2 + 1), 1 + yyt + 16 * (yyt * 3 + 1));
+        BitmapReplaceColor(Borders, 0, p1 * (yyt * 2), xxt * 2, yyt * 2, $636363, Tribe[p1].Color);
+        BordersOK^ := BordersOK^ or 1 shl p1;
+      end;
+      for dy := 0 to 1 do
+        for dx := 0 to 1 do begin
+          Loc1 := dLoc(Loc, dx * 2 - 1, dy * 2 - 1);
+          begin
+            if (Loc1 < 0) or (Loc1 >= G.lx * G.ly) then
+              p2 := -1
+            else if MyMap[Loc1] and fTerrain = fUNKNOWN then
+              p2 := p1
+            else
+              p2 := MyRO.Territory[Loc1];
+            if p2 <> p1 then
+            begin
+              BitBltBitmapOutput(HGrTerrain.Mask, X + dx * xxt, Y + dy * yyt, xxt,
+                yyt, 1 + 8 * (xxt * 2 + 1) + dx * xxt,
+                1 + yyt + 16 * (yyt * 3 + 1) + dy * yyt, SRCAND);
+              BitBltBitmapOutput(Borders, X + dx * xxt, Y + dy * yyt, xxt, yyt, dx * xxt,
+                p1 * (yyt * 2) + dy * yyt, SRCPAINT);
+            end;
+          end;
+        end;
+    end;
+  end;
+end;
+
+procedure TIsoMap.ShowSpacePort(X, Y, Tile: Integer; CityInfo: TCityInfo);
+begin
+  if ShowObjects and not (moEditMode in MapOptions) and
+    (Tile and fCity <> 0) and (CityInfo.Flags and ciSpacePort <> 0) then
+    TerrainSprite(X + xxt, Y - 6, spSpacePort);
+end;
+
 // (x,y) is top left pixel of (2*xxt,3*yyt) rectangle
 procedure TIsoMap.PaintTileObjects(X, Y, Loc, CityLoc, CityOwner: Integer;
   UseBlink: Boolean);
 var
-  p1, p2, uix, cix, dy, Loc1, Tile, Multi, Destination: Integer;
+  uix, cix, dy, Tile, Multi, Destination: Integer;
   CityInfo: TCityInfo;
   UnitInfo: TUnitInfo;
@@ -1057 +1136 @@
   SpecialRow: Integer;
   SpecialCol: Integer;
-
-  procedure NameCity;
-  var
-    cix, xs, W: Integer;
-    BehindCityInfo: TCityInfo;
-    S: string;
-    IsCapital: Boolean;
-  begin
-    BehindCityInfo.Loc := Loc - 2 * G.lx;
-    if ShowCityNames and not (moEditMode in MapOptions) and
-      (BehindCityInfo.Loc >= 0) and (BehindCityInfo.Loc < G.lx * G.ly) and
-      (MyMap[BehindCityInfo.Loc] and fCity <> 0) then
-    begin
-      GetCityInfo(BehindCityInfo.Loc, cix, BehindCityInfo);
-      IsCapital := BehindCityInfo.Flags and ciCapital <> 0;
-      { if Showuix and (cix>=0) then s:=IntToStr(cix)
-        else } S := CityName(BehindCityInfo.ID);
-      W := FOutput.Canvas.TextWidth(S);
-      xs := X + xxt - (W + 1) div 2;
-      if IsCapital then
-        FOutput.Canvas.Font.Style := FOutput.Canvas.Font.Style + [TFontStyle.fsUnderline];
-      TextOut(xs + 1, Y - 9, $000000, S);
-      TextOut(xs, Y - 10, $FFFFFF, S);
-      if IsCapital then
-        FOutput.Canvas.Font.Style := FOutput.Canvas.Font.Style - [TFontStyle.fsUnderline];
-    end;
-  end;
-
-  procedure ShowSpacePort;
-  begin
-    if ShowObjects and not (moEditMode in MapOptions) and
-      (Tile and fCity <> 0) and (CityInfo.Flags and ciSpacePort <> 0) then
-      TerrainSprite(X + xxt, Y - 6, spSpacePort);
-  end;
-
-  procedure PaintBorder;
-  var
-    dx, dy: Integer;
-  begin
-    if ShowBorder and (Loc >= 0) and (Loc < G.lx * G.ly) and
-      (Tile and fTerrain <> fUNKNOWN) then begin
-      p1 := MyRO.Territory[Loc];
-      if (p1 >= 0) and (ShowMyBorder or (p1 <> Me)) then begin
-        if BordersOK^ and (1 shl p1) = 0 then begin
-          UnshareBitmap(Borders);
-          BitBltBitmap(Borders, 0, p1 * (yyt * 2), xxt * 2,
-            yyt * 2, HGrTerrain.Data,
-            1 + 8 * (xxt * 2 + 1), 1 + yyt + 16 * (yyt * 3 + 1));
-          BitmapReplaceColor(Borders, 0, p1 * (yyt * 2), xxt * 2, yyt * 2, $636363, Tribe[p1].Color);
-          BordersOK^ := BordersOK^ or 1 shl p1;
-        end;
-        for dy := 0 to 1 do
-          for dx := 0 to 1 do begin
-            Loc1 := dLoc(Loc, dx * 2 - 1, dy * 2 - 1);
-            begin
-              if (Loc1 < 0) or (Loc1 >= G.lx * G.ly) then
-                p2 := -1
-              else if MyMap[Loc1] and fTerrain = fUNKNOWN then
-                p2 := p1
-              else
-                p2 := MyRO.Territory[Loc1];
-              if p2 <> p1 then
-              begin
-                BitBltBitmapOutput(HGrTerrain.Mask, X + dx * xxt, Y + dy * yyt, xxt,
-                  yyt, 1 + 8 * (xxt * 2 + 1) + dx * xxt,
-                  1 + yyt + 16 * (yyt * 3 + 1) + dy * yyt, SRCAND);
-                BitBltBitmapOutput(Borders, X + dx * xxt, Y + dy * yyt, xxt, yyt, dx * xxt,
-                  p1 * (yyt * 2) + dy * yyt, SRCPAINT);
-              end;
-            end;
-          end;
-      end;
-    end;
-  end;
-
 begin
   if (Loc < 0) or (Loc >= G.lx * G.ly) then
@@ -1143 +1147 @@
     (X > FRight) then
   begin
-    NameCity;
-    ShowSpacePort;
+    NameCity(X, Y, Loc);
+    ShowSpacePort(X, Y, Tile, CityInfo);
     Exit;
   end;
   if Tile and fTerrain = fUNKNOWN then
   begin
-    NameCity;
-    ShowSpacePort;
+    NameCity(X, Y, Loc);
+    ShowSpacePort(X, Y, Tile, CityInfo);
     Exit;
   end; { square not discovered }
 
   if not (FoW and (Tile and fObserved = 0)) then
-    PaintBorder;
+    PaintBorder(X, Y, Loc, Tile);
 
   if (Loc >= 0) and (Loc < G.lx * G.ly) and (Loc = FAdviceLoc) then
@@ -1211 +1215 @@
 
   if FoW and (Tile and fObserved = 0) then
-    PaintBorder;
+    PaintBorder(X, Y, Loc, Tile);
 
 {$IFNDEF SCR}
@@ -1239 +1243 @@
       else TerrainSprite(X, Y, 8 + 9 * 1); }
 
-    NameCity;
-    ShowSpacePort;
+    NameCity(X, Y, Loc);
+    ShowSpacePort(X, Y, Tile, CityInfo);
     if Tile and fCity <> 0 then
       PaintCity(X + xxt, Y + yyt, CityInfo, CityOwner < 0);
@@ -1383 +1387 @@
 begin
   Result := False;
-  for Dir := 0 to 7 do
-  begin
+  for Dir := 0 to 7 do begin
     ConnLoc := dLoc(Loc, Dirx[Dir], Diry[Dir]);
     if (ConnLoc < 0) or (ConnLoc >= G.lx * G.ly) or
-      ((MyMap[ConnLoc] - 2) and fTerrain < 13) then
-      Result := True;
+      ((MyMap[ConnLoc] - 2) and fTerrain < 13) then begin
+        Result := True;
+        Break;
+      end;
   end;
 end;