Changeset 247

Timestamp:

Sep 22, 2018, 1:27:09 PM (6 years ago)

Author:

chronos

Message:

• Fixed: Allow only meaningful sizes for cyclic maps.

Location:

trunk

Files:

• Forms/UFormNew.pas (modified) (1 diff)
• UMap.pas (modified) (2 diffs)
• UMapType.pas (modified) (6 diffs)

trunk/Forms/UFormNew.pas

@@ -566 +566 @@
     CityEnabled := CheckBoxCity.Checked;
     CityPercentage := SpinEditCityPercent.Value;
+    Map.Cyclic := CyclicMap;
     Map.Size := TPoint.Create(SpinEditMapSizeX.Value, SpinEditMapSizeY.Value);
     GrowAmount := TGrowAmount(RadioGroupGrowAmount.ItemIndex);

trunk/UMap.pas

@@ -134 +134 @@
   TMap = class
   private
-    FSize: TPoint;
     function GetPixelRect: TRect;
     function GetSize: TPoint; virtual;
     function SearchDifferentCellArea(List: TCells; SourceArea,
       DestArea: TMapArea): TCell;
-    procedure SetSize(AValue: TPoint); virtual;
   protected
+    FSize: TPoint;
     FPixelRect: TRect;
     FNewCellId: Integer;
     function GetNewCellId: Integer; virtual;
     procedure SortNeighborsByAngle;
+    procedure SetSize(AValue: TPoint); virtual;
   public
     Game: TObject; //TGame;
@@ -563 +563 @@
   // Do not assign Game field
   MaxPower := Source.MaxPower;
+  Cyclic := Source.Cyclic;
   Size := Source.Size;
   DefaultCellSize := Source.DefaultCellSize;
   Shape := Source.Shape;
   Image.Picture.Bitmap.Assign(Source.Image.Picture.Bitmap);
-  Cyclic := Source.Cyclic;
 
   // TODO: How to copy cells

trunk/UMapType.pas

@@ -25 +25 @@
     procedure GetCellPosNeighbors(CellPos: TPoint; Cell: TCell);
     function GetHexagonPolygon(Pos: TPoint; Size: TPoint): TPolygon;
+  protected
+    procedure SetSize(AValue: TPoint); override;
   public
     function CalculatePixelRect: TRect; override;
@@ -53 +55 @@
       CellMulY = 1.05;
     function GetTrianglePolygon(Pos: TPoint; Size: TPoint; Reverse: Boolean): TPolygon;
+  protected
+    procedure SetSize(AValue: TPoint); override;
   public
     procedure Generate; override;
@@ -75 +79 @@
       CellMulY = 3.35;
     function GetTilePolygon(Pos: TPoint; Size: TPoint): TPolygon;
+  protected
+    procedure SetSize(AValue: TPoint); override;
   public
     procedure Generate; override;
@@ -92 +98 @@
   Result.Points[2] := TPoint.Create(Pos.X, Trunc(Pos.Y + Size.Y / 3.5));
   Result.Points[3] := TPoint.Create(Trunc(Pos.X - Size.X / 2), Pos.Y);
+end;
+
+procedure TIsometricMap.SetSize(AValue: TPoint);
+begin
+  inherited;
+  if Cyclic then
+    FSize := TPoint.Create(FSize.X, FSize.Y + FSize.Y mod 2);
 end;
 
@@ -181 +194 @@
   Result.Points[4] := TPoint.Create(Trunc(Pos.X - Shift.X * Size.X), Trunc(Pos.Y + Shift.Y * Size.Y));
   Result.Points[5] := TPoint.Create(Trunc(Pos.X - Shift.X * Size.X), Trunc(Pos.Y - Shift.Y * Size.Y));
+end;
+
+procedure THexMap.SetSize(AValue: TPoint);
+begin
+  inherited;
+  if Cyclic then
+    FSize := TPoint.Create(FSize.X, FSize.Y + FSize.Y mod 2);
 end;
 
@@ -478 +498 @@
 end;
 
+procedure TTriangleMap.SetSize(AValue: TPoint);
+begin
+  inherited;
+  if Cyclic then
+    FSize := TPoint.Create(FSize.X + FSize.X mod 2, FSize.Y + FSize.Y mod 2);
+end;
+
 procedure TTriangleMap.Generate;
 var