Changeset 337 for trunk/LocalPlayer

Timestamp:

Apr 1, 2021, 9:30:25 AM (4 years ago)

Author:

chronos

Message:

• Fixed: Incorrect drawing of city names under units. MapOptions need to be global variable for all TIsoMap instances.

Location:

trunk/LocalPlayer

Files:

• IsoEngine.pas (modified) (7 diffs)
• Term.pas (modified) (4 diffs)

trunk/LocalPlayer/IsoEngine.pas

@@ -57 +57 @@
     BordersOK: PInteger;
     CitiesPictures: TCitiesPictures;
+    ShowLoc: Boolean;
+    ShowCityNames: Boolean;
+    ShowObjects: Boolean;
+    ShowBorder: Boolean;
+    ShowMyBorder: Boolean;
+    ShowGrWall: Boolean;
+    ShowDebug: Boolean;
+    FoW: Boolean;
     function Connection4(Loc, Mask, Value: integer): integer;
     function Connection8(Loc, Mask: integer): integer;
@@ -76 +84 @@
     HGrTerrain: TGraphicSet;
     HGrCities: TGraphicSet;
-    MapOptions: TMapOptions;
     pDebugMap: Integer; // -1 for off
     constructor Create;
@@ -122 +129 @@
 function IsJungle(y: integer): boolean;
 procedure Init(InitEnemyModelHandler: TInitEnemyModelEvent);
+
+var
+  MapOptions: TMapOptions;
 
 
@@ -161 +171 @@
   OnInitEnemyModel: TInitEnemyModelEvent;
   DebugMap: ^TTileList;
-  FoW: Boolean;
-  ShowLoc: Boolean;
-  ShowCityNames: Boolean;
-  ShowObjects: Boolean;
-  ShowBorder: Boolean;
-  ShowMyBorder: Boolean;
-  ShowGrWall: Boolean;
-  ShowDebug: Boolean;
   IsoMapCache: array[TTileSize] of TIsoMapCache;
 
@@ -1550 +1552 @@
                 begin
                   Aix := 0;
-                  bix := 0
+                  bix := 0;
                 end
                 else
                 begin
                   Aix := 0;
-                  bix := 1
+                  bix := 1;
                 end
               else if bix = -1 then
@@ -1561 +1563 @@
                 begin
                   Aix := 1;
-                  bix := 1
+                  bix := 1;
                 end
                 else
                 begin
                   Aix := 1;
-                  bix := 0
+                  bix := 0;
                 end;
               BitBltBitmap(OceanPatch, x + dx * xxt, y + dy * yyt, xxt, yyt,
@@ -1603 +1605 @@
             begin
               Aix := fDesert;
-              bix := fDesert
+              bix := fDesert;
             end
             else if Aix = -2 then

trunk/LocalPlayer/Term.pas

@@ -1259 +1259 @@
 begin
   MiniMap.MapOptions := MapOptionChecked;
-  MainMap.MapOptions := MapOptionChecked;
+  MapOptions := MapOptionChecked;
   if ClientMode = cEditMap then
-    MainMap.MapOptions := MainMap.MapOptions + [moEditMode];
+    MapOptions := MapOptions + [moEditMode];
   if mLocCodes.Checked then
-    MainMap.MapOptions := MainMap.MapOptions + [moLocCodes];
+    MapOptions := MapOptions + [moLocCodes];
 end;
 
@@ -3521 +3521 @@
   Buffer := TBitmap.Create;
   Buffer.PixelFormat := pf24bit;
-  if 2 * lxmax > 3 * xSizeBig then
-    Buffer.width := 2 * lxmax
-  else
-    Buffer.width := 3 * xSizeBig;
-  if lymax > 3 * ySizeBig then
-    Buffer.height := lymax
-  else
-    Buffer.height := 3 * ySizeBig;
+  if 2 * lxmax > 3 * xSizeBig then Buffer.width := 2 * lxmax
+    else Buffer.width := 3 * xSizeBig;
+  if lymax > 3 * ySizeBig then Buffer.height := lymax
+    else Buffer.height := 3 * ySizeBig;
   Buffer.Canvas.Font.Assign(UniFont[ftSmall]);
   for i := 0 to nPl - 1 do
@@ -5071 +5067 @@
           // if MoveHintToLoc>=0 then
           // ShowMoveHint(MoveHintToLoc, true);
-        end
+        end;
       end
       else if TurnComplete and not supervising then
@@ -6391 +6387 @@
 begin
   MainMap.pDebugMap := p;
-  MainMap.MapOptions := MainMap.MapOptions - [moLocCodes];
+  MapOptions := MapOptions - [moLocCodes];
   mLocCodes.Checked := false;
   MapValid := false;