Changeset 326 for trunk/LocalPlayer/Term.pas

Timestamp:

Mar 24, 2021, 12:08:28 AM (4 years ago)

Author:

chronos

Message:

• Modified: Mini map paint method moved from TMainScreen class to TMiniMap class.

File:

• trunk/LocalPlayer/Term.pas (modified) (21 diffs)

trunk/LocalPlayer/Term.pas

@@ -14 +14 @@
   LCLIntf, LCLType, SysUtils, Classes, Graphics, Controls, DrawDlg, Types,
   Forms, Menus, ExtCtrls, dateutils, Platform, ButtonB, ButtonC, EOTButton, Area,
-  UGraphicSet;
+  UGraphicSet, UMiniMap;
 
 const
@@ -253 +253 @@
     trix: array [0 .. 63] of Integer;
     AILogo: array [0 .. nPl - 1] of TBitmap;
-    Mini: TBitmap;
+    MiniMap: TMiniMap;
     Panel: TBitmap;
     TopBar: TBitmap;
@@ -274 +274 @@
     procedure ArrangeMidPanel;
     procedure MainOffscreenPaint;
-    procedure MiniPaint;
+    procedure MiniMapPaint;
     procedure PaintAll;
     procedure PaintAllMaps;
@@ -1266 +1266 @@
 procedure TMainScreen.SetMapOptions;
 begin
+  MiniMap.Options := MapOptionChecked;
   IsoEngine.Options := MapOptionChecked;
   if ClientMode = cEditMap then
@@ -2586 +2587 @@
         GameMode := Command;
         GrExt.ResetPixUsed;
-        IsoEngine.Reset;
+        IsoEngineReset;
         Tribes.Init;
         GetTribeList;
@@ -2639 +2640 @@
         CityDlg.Reset;
 
-        Mini.SetSize(G.lx * 2, G.ly);
+        MiniMap.Size := Point(G.lx, G.ly);
         for i := 0 to nPl - 1 do
         begin
@@ -2842 +2843 @@
           MyData := G.RO[NewPlayer].Data;
           SetTroopLoc(-1);
-          MiniPaint;
+          MiniMapPaint;
           InitAllEnemyModels; // necessary for correct replay
           if not EndTurn(true) then
@@ -3524 +3525 @@
   end;
 
-  Mini := TBitmap.Create;
-  Mini.PixelFormat := pf24bit;
+  MiniMap := TMiniMap.Create;
   Panel := TBitmap.Create;
   Panel.PixelFormat := pf24bit;
@@ -3560 +3560 @@
   FreeAndNil(sb);
   FreeAndNil(TopBar);
-  FreeAndNil(Mini);
+  FreeAndNil(MiniMap);
   FreeAndNil(Buffer);
   FreeAndNil(Panel);
@@ -4106 +4106 @@
 end;
 
-procedure TMainScreen.MiniPaint;
-var
-  uix, cix, x, y, Loc, i, hw, xm, cm, cmPolOcean, cmPolNone: integer;
-  PrevMiniPixel: TPixelPointer;
-  MiniPixel: TPixelPointer;
-  TerrainTile: Cardinal;
-begin
-  if not Assigned(MyMap) then Exit;
-  cmPolOcean := HGrSystem.Data.Canvas.Pixels[101, 67];
-  cmPolNone := HGrSystem.Data.Canvas.Pixels[102, 67];
-  hw := MapWidth div (xxt * 2);
-  with Mini.Canvas do begin
-    Brush.Color := $000000;
-    FillRect(Rect(0, 0, Mini.width, Mini.height));
-  end;
-  Mini.BeginUpdate;
-  MiniPixel := PixelPointer(Mini);
-  PrevMiniPixel := PixelPointer(Mini);
-  for y := 0 to ScaleToNative(G.ly) - 1 do begin
-    for x := 0 to ScaleToNative(G.lx) - 1 do begin
-      Loc := ScaleFromNative(x) + G.lx * ScaleFromNative(y);
-      if (MyMap[Loc] and fTerrain) <> fUNKNOWN then begin
-        for i := 0 to 1 do begin
-          xm := ((x - ScaleToNative(xwMini)) * 2 + i + y and 1 - ScaleToNative(hw) +
-            ScaleToNative(G.lx) * 5) mod (ScaleToNative(G.lx) * 2);
-          MiniPixel.SetXY(xm, y);
-          TerrainTile := MyMap[Loc] and fTerrain;
-          if TerrainTile > 11 then TerrainTile := 0;
-          cm := MiniColors[TerrainTile, i];
-          if ClientMode = cEditMap then
-          begin
-            if MyMap[Loc] and (fPrefStartPos or fStartPos) <> 0 then
-              cm := $FFFFFF;
-          end
-          else if MyMap[Loc] and fCity <> 0 then
-          begin
-            cix := MyRO.nCity - 1;
-            while (cix >= 0) and (MyCity[cix].Loc <> Loc) do
-              dec(cix);
-            if cix >= 0 then
-              cm := Tribe[me].Color
-            else
-            begin
-              cix := MyRO.nEnemyCity - 1;
-              while (cix >= 0) and (MyRO.EnemyCity[cix].Loc <> Loc) do
-                dec(cix);
-              if cix >= 0 then
-                cm := Tribe[MyRO.EnemyCity[cix].Owner].Color
-            end;
-            cm := $808080 or cm shr 1; { increase brightness }
-            if y > 0 then begin
-              // 2x2 city dot covers two lines
-              PrevMiniPixel.SetXY(xm, y - 1);
-              PrevMiniPixel.Pixel^.B := cm shr 16;
-              PrevMiniPixel.Pixel^.G := cm shr 8 and $FF;
-              PrevMiniPixel.Pixel^.R := cm and $FF;
-            end;
-          end
-          else if (i = 0) and (MyMap[Loc] and fUnit <> 0) then
-          begin
-            uix := MyRO.nUn - 1;
-            while (uix >= 0) and (MyUn[uix].Loc <> Loc) do
-              dec(uix);
-            if uix >= 0 then
-              cm := Tribe[me].Color
-            else
-            begin
-              uix := MyRO.nEnemyUn - 1;
-              while (uix >= 0) and (MyRO.EnemyUn[uix].Loc <> Loc) do
-                dec(uix);
-              if uix >= 0 then
-                cm := Tribe[MyRO.EnemyUn[uix].Owner].Color
-            end;
-            cm := $808080 or cm shr 1; { increase brightness }
-          end
-          else if MapOptionChecked and (1 shl moPolitical) <> 0 then
-          begin
-            if MyMap[Loc] and fTerrain < fGrass then
-              cm := cmPolOcean
-            else if MyRO.Territory[Loc] < 0 then
-              cm := cmPolNone
-            else
-              cm := Tribe[MyRO.Territory[Loc]].Color;
-          end;
-          MiniPixel.Pixel^.B := cm shr 16;
-          MiniPixel.Pixel^.G := cm shr 8 and $FF;
-          MiniPixel.Pixel^.R := cm and $FF;
-        end;
-      end;
-    end;
-  end;
-  Mini.EndUpdate;
-end;
-
 {$IFDEF LINUX}
 // Can't do scrolling of DC under Linux, then fallback into BitBlt.
@@ -4327 +4233 @@
 end;
 
+procedure TMainScreen.MiniMapPaint;
+begin
+  MiniMap.Paint(MyMap, MapWidth, ClientMode, xxt, xwMini);
+end;
+
 procedure TMainScreen.PaintAll;
 begin
@@ -4332 +4243 @@
   xwMini := xw;
   ywMini := yw;
-  MiniPaint;
+  MiniMapPaint;
   PanelPaint;
 end;
@@ -4341 +4252 @@
   xwMini := xw;
   ywMini := yw;
-  MiniPaint;
+  MiniMapPaint;
   CopyMiniToPanel;
   RectInvalidate(xMini + 2, TopBarHeight + MapHeight - overlap + yMini + 2,
@@ -4351 +4262 @@
 begin
   BitBltCanvas(Panel.Canvas, xMini + 2, yMini + 2, G.lx * 2, G.ly,
-    Mini.Canvas, 0, 0);
+    MiniMap.Bitmap.Canvas, 0, 0);
   if MarkCityLoc >= 0 then
     Sprite(Panel, HGrSystem, xMini - 2 + (4 * G.lx + 2 * (MarkCityLoc mod G.lx)
@@ -4358 +4269 @@
       CityMark2.Height, CityMark2.Left, CityMark2.Top)
   else if ywmax <= 0 then
-    Frame(Panel.Canvas, xMini + 2 + G.lx - MapWidth div (xxt * 2), yMini + 2,
+    Frame(Panel.Canvas,
+      xMini + 2 + G.lx - MapWidth div (xxt * 2), yMini + 2,
       xMini + 1 + G.lx + MapWidth div (xxt * 2), yMini + 2 + G.ly - 1,
       MainTexture.clMark, MainTexture.clMark)
   else
-    Frame(Panel.Canvas, xMini + 2 + G.lx - MapWidth div (xxt * 2),
-      yMini + 2 + yw, xMini + 1 + G.lx + MapWidth div (xxt * 2),
-      yMini + yw + MapHeight div yyt, MainTexture.clMark, MainTexture.clMark);
+    Frame(Panel.Canvas,
+      xMini + 2 + G.lx - MapWidth div (xxt * 2), yMini + 2 + yw,
+      xMini + 1 + G.lx + MapWidth div (xxt * 2), yMini + yw + MapHeight div yyt,
+      MainTexture.clMark, MainTexture.clMark);
 end;
 
@@ -5092 +5005 @@
   xwMini := xw;
   ywMini := yw;
-  MiniPaint;
+  MiniMapPaint;
   CopyMiniToPanel;
   RectInvalidate(xMini + 2, TopBarHeight + MapHeight - overlap + yMini + 2,
@@ -5298 +5211 @@
       BrushLoc := MouseLoc;
       PaintLoc(MouseLoc, 2);
-      MiniPaint;
+      MiniMapPaint;
       BitBltCanvas(Panel.Canvas, xMini + 2, yMini + 2, G.lx * 2, G.ly,
-        Mini.Canvas, 0, 0);
+        MiniMap.Bitmap.Canvas, 0, 0);
       if ywmax <= 0 then
         Frame(Panel.Canvas, xMini + 2 + G.lx - MapWidth div (2 * xxt),
@@ -7570 +7483 @@
           yw := ywmax;
       end;
-      BitBltCanvas(Buffer.Canvas, 0, 0, G.lx * 2, G.ly, Mini.Canvas, 0, 0);
+      BitBltCanvas(Buffer.Canvas, 0, 0, G.lx * 2, G.ly, MiniMap.Bitmap.Canvas, 0, 0);
       if ywmax <= 0 then
         Frame(Buffer.Canvas, x - xMini - 2 - MapWidth div (xxt * 2), 0,
@@ -7600 +7513 @@
     xwMini := xw;
     ywMini := yw;
-    MiniPaint;
+    MiniMapPaint;
     PanelPaint;
   end;
@@ -7881 +7794 @@
       end
       else if Flag = tfAllTechs then
-        TellNewModels
+        TellNewModels;
     end;
   end;
@@ -7892 +7805 @@
     MapOptionChecked := MapOptionChecked xor (1 shl (Tag shr 8));
     SetMapOptions;
-    ButtonIndex := MapOptionChecked shr (Tag shr 8) and 1 + 2
+    ButtonIndex := MapOptionChecked shr (Tag shr 8) and 1 + 2;
   end;
   if Sender = MapBtn0 then
   begin
-    MiniPaint;
-    PanelPaint
+    MiniMapPaint;
+    PanelPaint;
   end // update mini map only
   else