Changeset 465 for branches/highdpi/LocalPlayer/Wonders.pas

Timestamp:

Nov 30, 2023, 10:16:14 PM (12 months ago)

Author:

chronos

Message:

• Modified: Updated high dpi branch from trunk.
• Modified: Use generics.collections instead of fgl.
• Modified: Compile with Delphi syntax.

File:

• branches/highdpi/LocalPlayer/Wonders.pas (modified) (11 diffs)

branches/highdpi/LocalPlayer/Wonders.pas

@@ -23 +23 @@
     Selection: Integer;
     Center: TPoint;
-    procedure DarkIcon(i: Integer);
-    procedure Glow(i, GlowColor: Integer);
+    procedure DarkIcon(I: Integer);
+    procedure Glow(I, GlowColor: Integer);
     procedure PaintBackgroundShape;
   public
     procedure OffscreenPaint; override;
-    procedure ShowNewContent(NewMode: Integer);
-  end;
-
-var
-  WondersDlg: TWondersDlg;
+    procedure ShowNewContent(NewMode: TWindowMode);
+  end;
 
 
@@ -38 +35 @@
 
 uses
-  Term, ClientTools, Help, Tribes, UPixelPointer;
+  Term, ClientTools, Help, Tribes, PixelPointer;
 
 {$R *.lfm}
@@ -76 +73 @@
 procedure TWondersDlg.FormShow(Sender: TObject);
 begin
+  Caption := Phrases.Lookup('TITLE_WONDERS');
   Selection := -1;
   OffscreenPaint;
 end;
 
-procedure TWondersDlg.ShowNewContent(NewMode: Integer);
+procedure TWondersDlg.ShowNewContent(NewMode: TWindowMode);
 begin
   inherited ShowNewContent(NewMode);
@@ -109 +107 @@
   Height := ScaleToNative(128);
   Offscreen.BeginUpdate;
-  Line[0] := PixelPointer(Offscreen, ScaleToNative(Center.X), ScaleToNative(Center.Y));
-  Line[1] := PixelPointer(Offscreen, ScaleToNative(Center.X), ScaleToNative(Center.Y) - 1);
-  Line[2] := PixelPointer(Offscreen, ScaleToNative(Center.X) - 1, ScaleToNative(Center.Y));
-  Line[3] := PixelPointer(Offscreen, ScaleToNative(Center.X) - 1, ScaleToNative(Center.Y) - 1);
+  Line[0] := TPixelPointer.Create(Offscreen, ScaleToNative(Center.X), ScaleToNative(Center.Y));
+  Line[1] := TPixelPointer.Create(Offscreen, ScaleToNative(Center.X), ScaleToNative(Center.Y) - 1);
+  Line[2] := TPixelPointer.Create(Offscreen, ScaleToNative(Center.X) - 1, ScaleToNative(Center.Y));
+  Line[3] := TPixelPointer.Create(Offscreen, ScaleToNative(Center.X) - 1, ScaleToNative(Center.Y) - 1);
   for Y := 0 to Height - 1 do begin
     for X := 0 to Width - 1 do begin
-      r := X * X * ((Height div 4) * (Height div 4)) + Y * Y * ((Width div 4) * (Width div 4));
+      R := X * X * ((Height div 4) * (Height div 4)) + Y * Y * ((Width div 4) * (Width div 4));
       ax := ((1 shl 16 div (Height div 4)) * (Width div 4)) * Y;
-      if (r < ScaleToNative(8) * Height * Width * Width) and
-        ((r >= (Height div 4) * (Height div 2) * (Width div 2) * (Width div 2)) and (ax < amax2 * X) and
+      if (R < ScaleToNative(8) * Height * Width * Width) and
+        ((R >= (Height div 4) * (Height div 2) * (Width div 2) * (Width div 2)) and (ax < amax2 * X) and
         ((ax < amax0 * X) or (ax > amin2 * X)) or (ax > amin1 * X) and
         ((ax < amax1 * X) or (ax > amin3 * X))) then begin
         for ch := 0 to 2 do begin
-          c := Line[0].Pixel^.Planes[ch] - Darken;
-          if c < 0 then Line[0].Pixel^.Planes[ch] := 0
-            else Line[0].Pixel^.Planes[ch] := c;
-          c := Line[1].Pixel^.Planes[ch] - Darken;
-          if c < 0 then Line[1].Pixel^.Planes[ch] := 0
-            else Line[1].Pixel^.Planes[ch] := c;
-          c := Line[2].Pixel^.Planes[ch] - Darken;
-          if c < 0 then Line[2].Pixel^.Planes[ch] := 0
-            else Line[2].Pixel^.Planes[ch] := c;
-          c := Line[3].Pixel^.Planes[ch] - Darken;
-          if c < 0 then Line[3].Pixel^.Planes[ch] := 0
-            else Line[3].Pixel^.Planes[ch] := c;
+          C := Line[0].Pixel^.Planes[ch] - Darken;
+          if C < 0 then Line[0].Pixel^.Planes[ch] := 0
+            else Line[0].Pixel^.Planes[ch] := C;
+          C := Line[1].Pixel^.Planes[ch] - Darken;
+          if C < 0 then Line[1].Pixel^.Planes[ch] := 0
+            else Line[1].Pixel^.Planes[ch] := C;
+          C := Line[2].Pixel^.Planes[ch] - Darken;
+          if C < 0 then Line[2].Pixel^.Planes[ch] := 0
+            else Line[2].Pixel^.Planes[ch] := C;
+          C := Line[3].Pixel^.Planes[ch] - Darken;
+          if C < 0 then Line[3].Pixel^.Planes[ch] := 0
+            else Line[3].Pixel^.Planes[ch] := C;
         end;
       end;
@@ -149 +147 @@
 end;
 
-procedure TWondersDlg.DarkIcon(i: Integer);
+procedure TWondersDlg.DarkIcon(I: Integer);
 var
-  X, Y, ch, x0Dst, y0Dst, x0Src, y0Src, darken, c: Integer;
+  X, Y, ch, x0Dst, y0Dst, x0Src, y0Src, darken, C: Integer;
   Src, Dst: TPixelPointer;
 begin
   Offscreen.BeginUpdate;
-  x0Dst := ClientWidth div 2 - xSizeBig div 2 + RingPosition[i].X;
-  y0Dst := ClientHeight div 2 - ySizeBig div 2 + RingPosition[i].Y;
-  x0Src := (i mod 7) * xSizeBig;
-  y0Src := (i div 7 + SystemIconLines) * ySizeBig;
-  Src := PixelPointer(BigImp, ScaleToNative(x0Src), ScaleToNative(y0Src));
-  Dst := PixelPointer(Offscreen, ScaleToNative(x0Dst), ScaleToNative(y0Dst));
+  x0Dst := ClientWidth div 2 - xSizeBig div 2 + RingPosition[I].X;
+  y0Dst := ClientHeight div 2 - ySizeBig div 2 + RingPosition[I].Y;
+  x0Src := (I mod 7) * xSizeBig;
+  y0Src := (I div 7 + SystemIconLines) * ySizeBig;
+  Src := TPixelPointer.Create(BigImp, ScaleToNative(x0Src), ScaleToNative(y0Src));
+  Dst := TPixelPointer.Create(Offscreen, ScaleToNative(x0Dst), ScaleToNative(y0Dst));
   for Y := 0 to ScaleToNative(ySizeBig) - 1 do begin
     for X := 0 to ScaleToNative(xSizeBig) - 1 do begin
@@ -166 +164 @@
         15 + (255 - Src.Pixel^.R) * 9) div 128;
       for ch := 0 to 2 do begin
-        c := Dst.Pixel^.Planes[ch] - Darken;
-        if c < 0 then Dst.Pixel^.Planes[ch] := 0
-          else Dst.Pixel^.Planes[ch] := c;
+        C := Dst.Pixel^.Planes[ch] - Darken;
+        if C < 0 then Dst.Pixel^.Planes[ch] := 0
+          else Dst.Pixel^.Planes[ch] := C;
       end;
       Src.NextPixel;
@@ -179 +177 @@
 end;
 
-procedure TWondersDlg.Glow(i, GlowColor: Integer);
+procedure TWondersDlg.Glow(I, GlowColor: Integer);
 begin
   GlowFrame(Offscreen,
-    ClientWidth div 2 - xSizeBig div 2 + RingPosition[i].X,
-    ClientHeight div 2 - ySizeBig div 2 + RingPosition[i].Y,
+    ClientWidth div 2 - xSizeBig div 2 + RingPosition[I].X,
+    ClientHeight div 2 - ySizeBig div 2 + RingPosition[I].Y,
     xSizeBig, ySizeBig, GlowColor);
 end;
@@ -235 +233 @@
         WonderDestroyed: begin
           HaveWonder := True;
-          DpiBitCanvas(Offscreen.Canvas,
+          DpiBitBltCanvas(Offscreen.Canvas,
             Center.X - xSizeBig div 2 + RingPosition[I].X,
             Center.Y - ySizeBig div 2 + RingPosition[I].Y, xSizeBig,
@@ -243 +241 @@
         else begin
           HaveWonder := True;
-          DpiBitCanvas(Offscreen.Canvas,
+          DpiBitBltCanvas(Offscreen.Canvas,
             Center.X - xSizeBig div 2 + RingPosition[I].X,
             Center.Y - ySizeBig div 2 + RingPosition[I].Y, xSizeBig, ySizeBig,
@@ -280 +278 @@
 
   MarkUsedOffscreen(ClientWidth, ClientHeight);
-end; { OffscreenPaint }
+end;
 
 procedure TWondersDlg.CloseBtnClick(Sender: TObject);
@@ -350 +348 @@
 begin
   if Selection >= 0 then
-    HelpDlg.ShowNewContent(FWindowMode or wmPersistent, hkImp, Selection);
+    MainScreen.HelpDlg.ShowNewContent(WindowModeMakePersistent(FWindowMode), hkImp, Selection);
 end;