Changeset 349 for branches/highdpi/LocalPlayer/Enhance.pas

Timestamp:

Apr 6, 2021, 8:11:02 PM (3 years ago)

Author:

chronos

Message:

• Modified: Merged trunk branch version r348 into highdpi branch.

File:

• branches/highdpi/LocalPlayer/Enhance.pas (modified) (13 diffs)

branches/highdpi/LocalPlayer/Enhance.pas

@@ -7 +7 @@
   UDpiControls, ScreenTools, BaseWin, Protocol, ClientTools, Term, LCLIntf, LCLType,
 
-  SysUtils, Classes, Graphics, Controls, Forms,
+  SysUtils, Classes, Graphics, Controls, Forms, IsoEngine,
   ButtonB, ButtonC, Menus;
 
@@ -28 +28 @@
     Popup: TDpiPopupMenu;
     procedure FormCreate(Sender: TObject);
+    procedure FormDestroy(Sender: TObject);
     procedure FormPaint(Sender: TObject);
     procedure FormShow(Sender: TObject);
@@ -35 +36 @@
     procedure JobClick(Sender: TObject);
     procedure FormKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState);
+  private
+    NoMap: TIsoMap;
   public
     procedure ShowNewContent(NewMode: integer; TerrType: integer = -1);
@@ -45 +48 @@
   EnhanceDlg: TEnhanceDlg;
 
+
 implementation
 
-uses Help;
+uses
+  Help, UKeyBindings;
 
 {$R *.lfm}
@@ -57 +62 @@
 begin
   inherited;
+  NoMap := TIsoMap.Create;
   CaptionRight := CloseBtn.Left;
   CaptionLeft := ToggleBtn.Left + ToggleBtn.Width;
@@ -85 +91 @@
 end;
 
+procedure TEnhanceDlg.FormDestroy(Sender: TObject);
+begin
+  FreeAndNil(NoMap);
+end;
+
 procedure TEnhanceDlg.FormPaint(Sender: TObject);
 var
@@ -97 +108 @@
     if Controls[i] is TButtonC then
       DpiBitCanvas(Canvas, Controls[i].Left + 2, Controls[i].Top - 11, 8, 8,
-        GrExt[HGrSystem].Data.Canvas, 121 + Controls[i].Tag mod 7 * 9,
+        HGrSystem.Data.Canvas, 121 + Controls[i].Tag mod 7 * 9,
         1 + Controls[i].Tag div 7 * 9);
 end;
@@ -129 +140 @@
   while (EndStage < 5) and (MyData.EnhancementJobs[Page, EndStage] <> jNone) do
     inc(EndStage);
-  x := InnerWidth div 2 - xxt - (xxt + 3) * EndStage;
+  with NoMap do
+    x := InnerWidth div 2 - xxt - (xxt + 3) * EndStage;
 
   TerrType := Page;
@@ -185 +197 @@
     end;
 
-    if TerrType < fForest then
-      Sprite(offscreen, HGrTerrain, x, 64 - yyt, xxt * 2, yyt * 2,
-        1 + TerrType * (xxt * 2 + 1), 1 + yyt)
-    else
-    begin
-      Sprite(offscreen, HGrTerrain, x, 64 - yyt, xxt * 2, yyt * 2,
-        1 + 2 * (xxt * 2 + 1), 1 + yyt + 2 * (yyt * 3 + 1));
-      Sprite(offscreen, HGrTerrain, x, 64 - yyt, xxt * 2, yyt * 2,
-        1 + 7 * (xxt * 2 + 1), 1 + yyt + 2 * (2 + TerrType - fForest) *
-        (yyt * 3 + 1));
-    end;
-    if TileImp and fTerImp = tiFarm then
-      Sprite(offscreen, HGrTerrain, x, 64 - yyt, xxt * 2, yyt * 2,
-        1 + (xxt * 2 + 1), 1 + yyt + 12 * (yyt * 3 + 1))
-    else if TileImp and fTerImp = tiIrrigation then
-      Sprite(offscreen, HGrTerrain, x, 64 - yyt, xxt * 2, yyt * 2, 1,
-        1 + yyt + 12 * (yyt * 3 + 1));
-    if TileImp and fRR <> 0 then
-    begin
-      Sprite(offscreen, HGrTerrain, x, 64 - yyt, xxt * 2, yyt * 2,
-        1 + 6 * (xxt * 2 + 1), 1 + yyt + 10 * (yyt * 3 + 1));
-      Sprite(offscreen, HGrTerrain, x, 64 - yyt, xxt * 2, yyt * 2,
-        1 + 2 * (xxt * 2 + 1), 1 + yyt + 10 * (yyt * 3 + 1));
-    end
-    else if TileImp and fRoad <> 0 then
-    begin
-      Sprite(offscreen, HGrTerrain, x, 64 - yyt, xxt * 2, yyt * 2,
-        1 + 6 * (xxt * 2 + 1), 1 + yyt + 9 * (yyt * 3 + 1));
-      Sprite(offscreen, HGrTerrain, x, 64 - yyt, xxt * 2, yyt * 2,
-        1 + 2 * (xxt * 2 + 1), 1 + yyt + 9 * (yyt * 3 + 1));
-    end;
-    if TileImp and fTerImp = tiMine then
-      Sprite(offscreen, HGrTerrain, x, 64 - yyt, xxt * 2, yyt * 2,
-        1 + 2 * (xxt * 2 + 1), 1 + yyt + 12 * (yyt * 3 + 1));
-    inc(x, xxt * 2 + 6)
+    with NoMap do begin
+      if TerrType < fForest then
+        Sprite(offscreen, HGrTerrain, x, 64 - yyt, xxt * 2, yyt * 2,
+          1 + TerrType * (xxt * 2 + 1), 1 + yyt)
+      else
+      begin
+        Sprite(offscreen, HGrTerrain, x, 64 - yyt, xxt * 2, yyt * 2,
+          1 + 2 * (xxt * 2 + 1), 1 + yyt + 2 * (yyt * 3 + 1));
+        Sprite(offscreen, HGrTerrain, x, 64 - yyt, xxt * 2, yyt * 2,
+          1 + 7 * (xxt * 2 + 1), 1 + yyt + 2 * (2 + TerrType - fForest) *
+          (yyt * 3 + 1));
+      end;
+      if TileImp and fTerImp = tiFarm then
+        Sprite(offscreen, HGrTerrain, x, 64 - yyt, xxt * 2, yyt * 2,
+          1 + (xxt * 2 + 1), 1 + yyt + 12 * (yyt * 3 + 1))
+      else if TileImp and fTerImp = tiIrrigation then
+        Sprite(offscreen, HGrTerrain, x, 64 - yyt, xxt * 2, yyt * 2, 1,
+          1 + yyt + 12 * (yyt * 3 + 1));
+      if TileImp and fRR <> 0 then
+      begin
+        Sprite(offscreen, HGrTerrain, x, 64 - yyt, xxt * 2, yyt * 2,
+          1 + 6 * (xxt * 2 + 1), 1 + yyt + 10 * (yyt * 3 + 1));
+        Sprite(offscreen, HGrTerrain, x, 64 - yyt, xxt * 2, yyt * 2,
+          1 + 2 * (xxt * 2 + 1), 1 + yyt + 10 * (yyt * 3 + 1));
+      end
+      else if TileImp and fRoad <> 0 then
+      begin
+        Sprite(offscreen, HGrTerrain, x, 64 - yyt, xxt * 2, yyt * 2,
+          1 + 6 * (xxt * 2 + 1), 1 + yyt + 9 * (yyt * 3 + 1));
+        Sprite(offscreen, HGrTerrain, x, 64 - yyt, xxt * 2, yyt * 2,
+          1 + 2 * (xxt * 2 + 1), 1 + yyt + 9 * (yyt * 3 + 1));
+      end;
+      if TileImp and fTerImp = tiMine then
+        Sprite(offscreen, HGrTerrain, x, 64 - yyt, xxt * 2, yyt * 2,
+          1 + 2 * (xxt * 2 + 1), 1 + yyt + 12 * (yyt * 3 + 1));
+      inc(x, xxt * 2 + 6);
+    end;
   end;
 
@@ -289 +303 @@
 procedure TEnhanceDlg.CloseBtnClick(Sender: TObject);
 begin
-  Close
+  Close;
 end;
 
@@ -304 +318 @@
 begin
   Page := TComponent(Sender).Tag;
-  SmartUpdateContent
+  SmartUpdateContent;
 end;
 
@@ -324 +338 @@
           move(MyData.EnhancementJobs[Page, stage + 1],
             MyData.EnhancementJobs[Page, stage], 4 - stage);
-        MyData.EnhancementJobs[Page, 4] := jNone
+        MyData.EnhancementJobs[Page, 4] := jNone;
       end
       else
@@ -351 +365 @@
     begin
       MyData.EnhancementJobs[Page, stage] := jRoad;
-      inc(stage)
+      inc(stage);
     end;
     if (NewJob = jFarm) and not(jIrr in Done) then
     begin
       MyData.EnhancementJobs[Page, stage] := jIrr;
-      inc(stage)
-    end;
-    MyData.EnhancementJobs[Page, stage] := NewJob
-  end;
-  SmartUpdateContent
+      inc(stage);
+    end;
+    MyData.EnhancementJobs[Page, stage] := NewJob;
+  end;
+  SmartUpdateContent;
 end;
 
 procedure TEnhanceDlg.FormKeyDown(Sender: TObject; var Key: Word;
   Shift: TShiftState);
-begin
-  if Key = VK_F1 then
+var
+  ShortCut: TShortCut;
+begin
+  ShortCut := KeyToShortCut(Key, Shift);
+  if BHelp.Test(ShortCut) then
     HelpDlg.ShowNewContent(FWindowMode or wmPersistent, hkText,
       HelpDlg.TextIndex('MACRO'))