Changeset 591 for trunk

Timestamp:

Jul 24, 2024, 11:02:31 PM (4 months ago)

Author:

chronos

Message:

• Modified: Draw graphical preview for maps which doesn't have associated image.

Location:

trunk

Files:

• Database.pas (modified) (5 diffs)
• GameServer.pas (modified) (3 diffs)
• MiniMap.pas (modified) (5 diffs)

trunk/Database.pas

@@ -598 +598 @@
 }
 var
-  primitive: Integer;
+  Primitive: Integer;
   StartLoc, StartLoc2: array [0 .. nPl - 1] of Integer; { starting coordinates }
   Elevation: array [0 .. lxmax * lymax - 1] of Byte; { map elevation }
@@ -607 +607 @@
   I, J: Integer;
 begin
-  primitive := 1;
+  Primitive := 1;
   I := 2;
   while I * I <= MapSize + 1 do // test whether prime
   begin
     if (MapSize + 1) mod I = 0 then
-      primitive := 0;
+      Primitive := 0;
     Inc(I);
   end;
 
-  if primitive > 0 then
+  if Primitive > 0 then
     repeat
-      Inc(primitive);
+      Inc(Primitive);
       I := 1;
       J := 0;
       repeat
         Inc(J);
-        I := I * primitive mod (MapSize + 1);
+        I := I * Primitive mod (MapSize + 1);
       until (I = 1) or (J = MapSize + 1);
     until J = MapSize;
@@ -630 +630 @@
 function MapGeneratorAvailable: Boolean;
 begin
-  Result := (primitive > 0) and (lx >= 20) and (ly >= 40);
+  Result := (Primitive > 0) and (lx >= 20) and (ly >= 40);
 end;
 
@@ -1155 +1155 @@
         (Loc0 < MapSize - lx) then
         RunRiver(Loc0);
-      Loc0 := (Loc0 + 1) * primitive mod (MapSize + 1) - 1;
+      Loc0 := (Loc0 + 1) * Primitive mod (MapSize + 1) - 1;
     end;
   end;
@@ -1413 +1413 @@
         end;
       end;
-      Loc := (Loc + 1) * primitive mod (MapSize + 1) - 1;
+      Loc := (Loc + 1) * Primitive mod (MapSize + 1) - 1;
     end;
 

trunk/GameServer.pas

@@ -291 +291 @@
   LandMass := ALandMass;
   DelphiRandSeed := PreviewRND;
-  if not PreviewElevation then
-  begin
+  if not PreviewElevation then begin
     CreateElevation;
     PreviewElevation := True;
@@ -1382 +1381 @@
   GAlive := 0;
   GWatching := 1;
-  for Loc1 := 0 to MapSize - 1 do
-    RealMap[Loc1] := fOcean or ($F shl 27);
   if FileExists(MapFileName) then begin
     Map := TMap.Create;
@@ -1392 +1389 @@
     Move(Map.Tiles[0], RealMap, MapSize * 4);
     FreeAndNil(Map);
+  end else begin
+    for Loc1 := 0 to MapSize - 1 do
+      RealMap[Loc1] := fOcean or ($F shl 27);
   end;
   CL := nil;

trunk/MiniMap.pas

@@ -26 +26 @@
     procedure LoadFromLogFile(FileName: string; var LastTurn: Integer; DefaultSize: TPoint);
     procedure LoadFromMapFile(FileName: string; var nMapLandTiles, nMapStartPositions: Integer);
+    procedure PaintMap(Map: TMap);
     procedure PaintRandom(Brightness, StartLandMass: Integer; WorldSize: TPoint);
     procedure PaintFile(SaveMap: TMapArray);
@@ -111 +112 @@
 procedure TMiniMap.LoadFromMapFile(FileName: string; var nMapLandTiles, nMapStartPositions: Integer);
 var
-  x, y: integer;
-  MapRow: array [0 .. lxmax - 1] of Cardinal;
+  X, Y: Integer;
   ImageFileName: string;
   Map: TMap;
   Tile: Cardinal;
+  PaintMapEnabled: Boolean;
 begin
   ImageFileName := Copy(FileName, 1, Length(FileName) - Length(CevoMapExt)) + CevoMapPictureExt;
@@ -126 +127 @@
       Bitmap.Height := MaxHeightMapLogo;
     Size := Point(Bitmap.Width div 2, Bitmap.Height);
+    PaintMapEnabled := False;
   end else begin
-    Mode := mmNone;
+    Mode := mmPicture;
     Size := Point(MaxWidthMapLogo, MaxHeightMapLogo);
+    PaintMapEnabled := True;
   end;
 
@@ -136 +139 @@
     nMapLandTiles := 0;
     nMapStartPositions := 0;
-    for y := 0 to Map.Size.Y - 1 do begin
+    for Y := 0 to Map.Size.Y - 1 do begin
       for X := 0 to Map.Size.X - 1 do begin
         Tile := Map.Tiles[Y * Map.Size.X + X];
@@ -148 +151 @@
     if nMapStartPositions > nPl then
       nMapStartPositions := nPl;
+
+    if PaintMapEnabled then begin
+      Size := Map.Size;
+      PaintMap(Map);
+    end;
   finally
     FreeAndNil(Map);
+  end;
+end;
+
+procedure TMiniMap.PaintMap(Map: TMap);
+var
+  i, x, y, xm, cm, Tile, OwnColor, EnemyColor: integer;
+  MiniPixel: TPixelPointer;
+  PrevMiniPixel: TPixelPointer;
+  xx, yy: Integer;
+begin
+  OwnColor := HGrSystem.Data.Canvas.Pixels[95, 67];
+  EnemyColor := HGrSystem.Data.Canvas.Pixels[96, 67];
+  Bitmap.PixelFormat := TPixelFormat.pf24bit;
+  Bitmap.SetSize(Size.X * 2, Size.Y);
+  if Mode = mmPicture then begin
+    Bitmap.BeginUpdate;
+    MiniPixel := TPixelPointer.Create(Bitmap);
+    PrevMiniPixel := TPixelPointer.Create(Bitmap);
+    xx := ScaleToNative(Size.X);
+    yy := ScaleToNative(Size.Y);
+    for y := 0 to yy - 1 do begin
+      for x := 0 to xx - 1 do begin
+        for i := 0 to 1 do begin
+          xm := (x * 2 + i + y and 1) mod (xx * 2);
+          MiniPixel.SetX(xm);
+          Tile := Map.Tiles[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);
+              if (PByte(PrevMiniPixel.Pixel) >= Bitmap.RawImage.Data) and
+              (PByte(PrevMiniPixel.Pixel) < (Bitmap.RawImage.Data + yy * PrevMiniPixel.BytesPerLine)) then begin
+                PrevMiniPixel.PixelB := cm shr 16;
+                PrevMiniPixel.PixelG:= cm shr 8 and $FF;
+                PrevMiniPixel.PixelR := cm and $FF;
+              end;
+            end;
+          end
+          else if (i = 0) and (Tile and smUnit <> 0) then begin
+            if Tile and smOwned <> 0 then cm := OwnColor
+              else cm := EnemyColor;
+          end else
+            cm := Colors[Tile and fTerrain, i];
+          if (PByte(MiniPixel.Pixel) >= Bitmap.RawImage.Data) and
+          (PByte(MiniPixel.Pixel) < (Bitmap.RawImage.Data + yy * MiniPixel.BytesPerLine)) then begin
+            MiniPixel.PixelB := (cm shr 16) and $ff;
+            MiniPixel.PixelG := (cm shr 8) and $ff;
+            MiniPixel.PixelR := (cm shr 0) and $ff;
+          end;
+        end;
+      end;
+      MiniPixel.NextLine;
+      if y > 0 then PrevMiniPixel.NextLine;
+    end;
+    Bitmap.EndUpdate;
   end;
 end;