Changeset 320

Timestamp:

Mar 22, 2021, 9:53:40 PM (3 years ago)

Author:

chronos

Message:

• Modified: TMiniMap moved from Start unit to UMiniMap unit.

Location:

trunk

Files:

• Integrated.lpi (modified) (2 diffs)
• Start.pas (modified) (7 diffs)
• UMiniMap.pas (added)

trunk/Integrated.lpi

@@ -95 +95 @@
       </Item2>
     </RequiredPackages>
-    <Units Count="42">
+    <Units Count="43">
       <Unit0>
         <Filename Value="Integrated.lpr"/>
@@ -336 +336 @@
         <IsPartOfProject Value="True"/>
       </Unit41>
+      <Unit42>
+        <Filename Value="UMiniMap.pas"/>
+        <IsPartOfProject Value="True"/>
+      </Unit42>
     </Units>
   </ProjectOptions>

trunk/Start.pas

@@ -7 +7 @@
   GameServer, Messg, ButtonBase, ButtonA, ButtonC, ButtonB, Area, Types,
   LCLIntf, LCLType, SysUtils, Classes, Graphics, Controls, Forms, StdCtrls,
-  Menus, Registry, DrawDlg, fgl, Protocol;
+  Menus, Registry,  DrawDlg, fgl, Protocol, UMiniMap;
 
 type
@@ -34 +34 @@
   TMainAction = (maConfig, maManual, maCredits, maAIDev, maWeb, maNone);
   TMainActionSet = set of TMainAction;
-
-  TMapArray = array[0 .. lxmax * lymax - 1] of Byte;
-
-  TMiniMode = (mmNone, mmPicture, mmMultiPlayer);
-
-  { TMiniMap }
-
-  TMiniMap = class
-  const
-    MaxWidthMapLogo = 96;
-    MaxHeightMapLogo = 96;
-  var
-    Bitmap: TBitmap; { game world sample preview }
-    Size: TPoint;
-    Colors: array [0 .. 11, 0 .. 1] of TColor;
-    Mode: TMiniMode;
-    procedure LoadFromLogFile(FileName: string; var LastTurn: Integer);
-    procedure LoadFromMapFile(FileName: string; var nMapLandTiles, nMapStartPositions: Integer);
-    procedure PaintRandom(Brightness, StartLandMass, WorldSize: Integer);
-    procedure PaintFile(SaveMap: TMapArray);
-    constructor Create;
-    destructor Destroy; override;
-  end;
 
   { TStartDlg }
@@ -166 +143 @@
 
 uses
-  Global, Directories, Direct, ScreenTools, Inp, Back, Settings, UPixelPointer;
+  Global, Directories, Direct, ScreenTools, Inp, Back, Settings;
 
 {$R *.lfm}
@@ -225 +202 @@
   PlayerAutoDiff: array [1 .. 5] of integer = (1, 1, 2, 2, 3);
   EnemyAutoDiff: array [1 .. 5] of integer = (4, 3, 2, 1, 1);
-
-{ TMiniMap }
-
-constructor TMiniMap.Create;
-var
-  X, Y: Integer;
-begin
-  Bitmap := TBitmap.Create;
-
-  for X := 0 to 11 do
-    for Y := 0 to 1 do
-      Colors[x, y] := HGrSystem.Data.Canvas.Pixels[66 + x, 67 + y];
-end;
-
-destructor TMiniMap.Destroy;
-begin
-  FreeAndNil(Bitmap);
-  inherited;
-end;
-
-procedure TMiniMap.LoadFromLogFile(FileName: string; var LastTurn: Integer);
-var
-  SaveMap: TMapArray;
-  y: Integer;
-  Dummy: Integer;
-  FileLandMass: integer;
-  LogFile: file;
-  s: string[255];
-  MapRow: array [0 .. lxmax - 1] of Cardinal;
-begin
-  AssignFile(LogFile, FileName);
-  try
-    Reset(LogFile, 4);
-    BlockRead(LogFile, s[1], 2); { file id }
-    BlockRead(LogFile, Dummy, 1); { format id }
-    if Dummy >= $000E01 then
-      BlockRead(LogFile, Dummy, 1); { item stored since 0.14.1 }
-    BlockRead(LogFile, Size.X, 1);
-    BlockRead(LogFile, Size.Y, 1);
-    BlockRead(LogFile, FileLandMass, 1);
-    if FileLandMass = 0 then
-      for y := 0 to Size.Y - 1 do
-        BlockRead(LogFile, MapRow, Size.X);
-    BlockRead(LogFile, Dummy, 1);
-    BlockRead(LogFile, Dummy, 1);
-    BlockRead(LogFile, LastTurn, 1);
-    BlockRead(LogFile, SaveMap, 1);
-    if SaveMap[0] = $80 then
-      Mode := mmMultiPlayer
-    else
-      Mode := mmPicture;
-    if Mode = mmPicture then
-      BlockRead(LogFile, SaveMap[4], (Size.X * Size.Y - 1) div 4);
-    CloseFile(LogFile);
-  except
-    CloseFile(LogFile);
-    LastTurn := 0;
-    Size := WorldSizes[DefaultWorldSize];
-    Mode := mmNone;
-  end;
-  PaintFile(SaveMap);
-end;
-
-procedure TMiniMap.LoadFromMapFile(FileName: string; var nMapLandTiles, nMapStartPositions: Integer);
-var
-  x, y, lxFile, lyFile: integer;
-  MapFile: file;
-  s: string[255];
-  MapRow: array [0 .. lxmax - 1] of Cardinal;
-  ImageFileName: string;
-begin
-  ImageFileName := Copy(FileName, 1, Length(FileName) - Length(CevoMapExt)) + '.png';
-  Mode := mmPicture;
-  if LoadGraphicFile(Bitmap, ImageFileName, [gfNoError]) then
-  begin
-    if Bitmap.width div 2 > MaxWidthMapLogo then
-      Bitmap.width := MaxWidthMapLogo * 2;
-    if Bitmap.height > MaxHeightMapLogo then
-      Bitmap.height := MaxHeightMapLogo;
-    Size.X := Bitmap.width div 2;
-    Size.Y := Bitmap.height;
-  end
-  else
-  begin
-    Mode := mmNone;
-    Size.X := MaxWidthMapLogo;
-    Size.Y := MaxHeightMapLogo;
-  end;
-
-  AssignFile(MapFile, FileName);
-  try
-    Reset(MapFile, 4);
-    BlockRead(MapFile, s[1], 2); { file id }
-    BlockRead(MapFile, x, 1); { format id }
-    BlockRead(MapFile, x, 1); // MaxTurn
-    BlockRead(MapFile, lxFile, 1);
-    BlockRead(MapFile, lyFile, 1);
-    nMapLandTiles := 0;
-    nMapStartPositions := 0;
-    for y := 0 to lyFile - 1 do begin
-      BlockRead(MapFile, MapRow, lxFile);
-      for x := 0 to lxFile - 1 do
-      begin
-        if (MapRow[x] and fTerrain) in [fGrass, fPrairie, fTundra, fSwamp,
-          fForest, fHills] then
-          inc(nMapLandTiles);
-        if MapRow[x] and (fPrefStartPos or fStartPos) <> 0 then
-          inc(nMapStartPositions);
-      end
-    end;
-    if nMapStartPositions > nPl then
-      nMapStartPositions := nPl;
-    CloseFile(MapFile);
-  except
-    CloseFile(MapFile);
-  end;
-end;
-
-procedure TMiniMap.PaintRandom(Brightness, StartLandMass, WorldSize: Integer);
-var
-  i, x, y, xm, cm: Integer;
-  MiniPixel: TPixelPointer;
-  Map: ^TTileList;
-begin
-  Map := PreviewMap(StartLandMass);
-  Size := WorldSizes[WorldSize];
-
-  Bitmap.PixelFormat := pf24bit;
-  Bitmap.SetSize(Size.X * 2, Size.Y);
-  Bitmap.BeginUpdate;
-  MiniPixel := PixelPointer(Bitmap);
-  for y := 0 to ScaleToNative(Size.Y) - 1 do begin
-    for x := 0 to ScaleToNative(Size.X) - 1 do begin
-      for i := 0 to 1 do begin
-        xm := (x * 2 + i + y and 1) mod (ScaleToNative(Size.X) * 2);
-        MiniPixel.SetX(xm);
-        cm := Colors
-          [Map[ScaleFromNative(x) * lxmax div Size.X + lxmax *
-          ((ScaleFromNative(y) * (lymax - 1) + Size.Y div 2) div (Size.Y - 1))] and
-          fTerrain, i];
-        MiniPixel.Pixel^.B := ((cm shr 16) and $FF) * Brightness div 3;
-        MiniPixel.Pixel^.G := ((cm shr 8) and $FF) * Brightness div 3;
-        MiniPixel.Pixel^.R := ((cm shr 0) and $FF) * Brightness div 3;
-      end;
-    end;
-    MiniPixel.NextLine;
-  end;
-  Bitmap.EndUpdate;
-end;
-
-procedure TMiniMap.PaintFile(SaveMap: TMapArray);
-var
-  i, x, y, xm, cm, Tile, OwnColor, EnemyColor: integer;
-  MiniPixel: TPixelPointer;
-  PrevMiniPixel: TPixelPointer;
-begin
-  OwnColor := HGrSystem.Data.Canvas.Pixels[95, 67];
-  EnemyColor := HGrSystem.Data.Canvas.Pixels[96, 67];
-  Bitmap.PixelFormat := pf24bit;
-  Bitmap.SetSize(Size.X * 2, Size.Y);
-  if Mode = mmPicture then begin
-    Bitmap.BeginUpdate;
-    MiniPixel := PixelPointer(Bitmap);
-    PrevMiniPixel := PixelPointer(Bitmap, 0, -1);
-    for y := 0 to ScaleToNative(Size.Y) - 1 do begin
-      for x := 0 to ScaleToNative(Size.X) - 1 do begin
-        for i := 0 to 1 do begin
-          xm := (x * 2 + i + y and 1) mod (ScaleToNative(Size.X) * 2);
-          MiniPixel.SetX(xm);
-          Tile := SaveMap[ScaleFromNative(x) + Size.X * ScaleFromNative(y)];
-          if Tile and fTerrain = fUNKNOWN then
-            cm := $000000
-          else if Tile and smCity <> 0 then
-          begin
-            if Tile and smOwned <> 0 then
-              cm := OwnColor
-            else
-              cm := EnemyColor;
-            if y > 0 then begin
-              // 2x2 city dot covers two lines
-              PrevMiniPixel.SetX(xm);
-              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 (Tile and smUnit <> 0) then
-            if Tile and smOwned <> 0 then
-              cm := OwnColor
-            else cm := EnemyColor
-          else
-            cm := Colors[Tile and fTerrain, i];
-          MiniPixel.Pixel^.B := (cm shr 16) and $ff;
-          MiniPixel.Pixel^.G := (cm shr 8) and $ff;
-          MiniPixel.Pixel^.R := (cm shr 0) and $ff;
-        end;
-      end;
-      MiniPixel.NextLine;
-      PrevMiniPixel.NextLine;
-    end;
-    Bitmap.EndUpdate;
-  end;
-end;
 
 { TStartDlg }
@@ -1261 +1035 @@
     pgStartRandom: begin
       MiniMap.Mode := mmPicture;
-      MiniMap.PaintRandom(3, StartLandMass, WorldSize);
+      MiniMap.PaintRandom(3, StartLandMass, WorldSizes[WorldSize]);
     end;
     pgNoLoad: begin
@@ -1269 +1043 @@
     pgLoad: begin
         MiniMap.LoadFromLogFile(GetSavedDir + DirectorySeparator +
-          List.Items[List.ItemIndex] + CevoExt, LastTurn);
+          List.Items[List.ItemIndex] + CevoExt, LastTurn, WorldSizes[DefaultWorldSize]);
         // BookDate:=DateToStr(FileDateToDateTime(FileAge(FileName)));
         if not TurnValid then  begin
@@ -1281 +1055 @@
       MapFileName := '';
       MiniMap.Mode := mmPicture;
-      MiniMap.PaintRandom(4, StartLandMass, WorldSize);
+      MiniMap.PaintRandom(4, StartLandMass, WorldSizes[WorldSize]);
     end;
     pgStartMap, pgEditMap: