Changeset 193

Timestamp:

May 14, 2018, 5:02:00 PM (6 years ago)

Author:

chronos

Message:

• Added: Isometric map type.
• Modified: Removed unneeded explicit typecast for list items.

Location:

trunk

Files:

• Forms/UFormNew.pas (modified) (3 diffs)
• Languages/xtactics.cs.po (modified) (2 diffs)
• Languages/xtactics.po (modified) (1 diff)
• UCore.lfm (modified) (5 diffs)
• UCore.pas (modified) (1 diff)
• UGame.pas (modified) (46 diffs)
• UMap.pas (modified) (9 diffs)

trunk/Forms/UFormNew.pas

@@ -125 +125 @@
   SGridTypeTriangle = 'Triangonal';
   SGridTypeVoronoi = 'Voronoi random';
+  SGridTypeIsometric = 'Isometric';
   SWinObjectiveDefeatAllOponents = 'Defeat all oponents';
   SWinObjectiveDefeatAllCities = 'Defeat all oponents cities';
@@ -143 +144 @@
 begin
   if (Item.Index >= 0) and (Item.Index < Players.Count) then
-  with TPlayer(Players[Item.Index]) do begin
+  with Players[Item.Index] do begin
     Item.Caption := Name;
     Item.Data := Players[Item.Index];
@@ -211 +212 @@
     Items.Add(SGridTypeTriangle);
     Items.Add(SGridTypeVoronoi);
+    Items.Add(SGridTypeIsometric);
     ItemIndex := LastIndex;
   end;

trunk/Languages/xtactics.cs.po

@@ -9 +9 @@
 "MIME-Version: 1.0\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 2.0.4\n"
+"X-Generator: Poedit 1.8.8\n"
 "Language: cs\n"
 
@@ -730 +730 @@
 msgstr "Hexagonální"
 
+#: uformnew.sgridtypeisometric
+msgid "Isometric"
+msgstr "Izometrický"
+
 #: uformnew.sgridtypesquare
 msgid "Square"

trunk/Languages/xtactics.po

@@ -709 +709 @@
 msgstr ""
 
+#: uformnew.sgridtypeisometric
+msgid "Isometric"
+msgstr ""
+
 #: uformnew.sgridtypesquare
 msgid "Square"

trunk/UCore.lfm

@@ -3 +3 @@
   OnDestroy = DataModuleDestroy
   OldCreateOrder = False
-  Height = 811
-  HorizontalOffset = 438
-  VerticalOffset = 341
-  Width = 1258
-  PPI = 144
+  Height = 676
+  HorizontalOffset = 365
+  VerticalOffset = 284
+  Width = 1048
+  PPI = 120
   object ActionList1: TActionList
     Images = ImageListSmall
-    left = 136
-    top = 60
+    left = 113
+    top = 50
     object AExit: TAction
       Caption = 'Exit'
@@ -93 +93 @@
   end
   object ImageListSmall: TImageList
-    left = 786
-    top = 420
+    left = 655
+    top = 350
     Bitmap = {
       4C690C00000010000000100000000000000000000000E3AA4BD6E5B35EFFE3B1
@@ -486 +486 @@
     POFilesFolder = 'Languages'
     OnTranslate = CoolTranslator1Translate
-    left = 137
-    top = 436
+    left = 114
+    top = 363
   end
   object ImageListLarge: TImageList
     Height = 32
     Width = 32
-    left = 786
-    top = 286
+    left = 655
+    top = 238
     Bitmap = {
       4C690C0000002000000020000000000000000000000000000000E2AA4B36E2A9
@@ -2038 +2038 @@
     RootName = 'CONFIG'
     ReadOnly = False
-    left = 137
-    top = 556
+    left = 114
+    top = 463
   end
   object OpenDialog1: TOpenDialog
     DefaultExt = '.xtmap'
-    left = 1126
-    top = 292
+    left = 938
+    top = 243
   end
   object SaveDialog1: TSaveDialog
     DefaultExt = '.xtmap'
-    left = 1126
-    top = 166
+    left = 938
+    top = 138
   end
   object ApplicationInfo: TApplicationInfo
@@ -2062 +2062 @@
     AuthorsName = 'Chronos'
     AppName = 'xTactics'
-    ReleaseDate = 43058
+    ReleaseDate = 43234
     RegistryKey = '\Software\xTactics'
     RegistryRoot = rrKeyCurrentUser
     License = 'CC0'
-    left = 137
-    top = 180
+    left = 114
+    top = 150
   end
   object PersistentForm: TPersistentForm
     MinVisiblePart = 50
     EntireVisible = False
-    left = 780
-    top = 600
+    left = 650
+    top = 500
   end
   object ScaleDPI1: TScaleDPI
     AutoDetect = False
-    left = 136
-    top = 676
+    left = 113
+    top = 563
   end
   object LastOpenedList1: TLastOpenedList
     MaxCount = 10
     OnChange = LastOpenedList1Change
-    left = 137
-    top = 300
+    left = 114
+    top = 250
   end
 end

trunk/UCore.pas

@@ -533 +533 @@
 
     // Update translated default player names
-    TPlayer(Game.PlayersSetting[0]).Name := SPlayer + ' 1';
-    TPlayer(Game.PlayersSetting[1]).Name := SPlayer + ' 2';
+    Game.PlayersSetting[0].Name := SPlayer + ' 1';
+    Game.PlayersSetting[1].Name := SPlayer + ' 2';
 
     LoadConfig;

trunk/UGame.pas

@@ -12 +12 @@
 const
   DefaultPlayerStartUnits = 5;
-  HexCellMulX = 1.12;
-  HexCellMulY = 1.292;
   SquareCellMulX = 1.05;
   SquareCellMulY = 1.05;
@@ -414 +412 @@
   TGrowAmount = (gaByOne, gaBySquareRoot);
   TGrowCells = (gcNone, gcPlayerCities, gcPlayerAll);
-  TMapType = (mtNone, mtHexagon, mtSquare, mtTriangle, mtVoronoi);
+  TMapType = (mtNone, mtHexagon, mtSquare, mtTriangle, mtVoronoi, mtIsometric);
   TWinObjective = (woDefeatAllOponents, woDefeatAllOponentsCities,
     woSpecialCaptureCell, woStayAliveForDefinedTurns);
@@ -636 +634 @@
 begin
   for I := 0 to Cells.Count - 1 do begin
-    if TCell(Cells[I]).Neighbors.Remove(TCell(Cells[1 - I])) = -1 then
+    if Cells[I].Neighbors.Remove(Cells[1 - I]) = -1 then
       raise Exception.Create(SCellRemoveNeighborError);
-    if TCell(Cells[I]).Links.Remove(Self) = -1 then
+    if Cells[I].Links.Remove(Self) = -1 then
       raise Exception.Create(SCellRemoveNeighborError);
   end;
@@ -756 +754 @@
 begin
   I := 0;
-  while (I < Count) and (TPlayerCell(Items[I]).MapCell <> Cell) do Inc(I);
-  if I < Count then Result := TPlayerCell(Items[I])
+  while (I < Count) and (Items[I].MapCell <> Cell) do Inc(I);
+  if I < Count then Result := Items[I]
     else Result := nil;
 end;
@@ -785 +783 @@
     NewNode := Node.OwnerDocument.CreateElement('Cell');
     Node.AppendChild(NewNode);
-    TPlayerCell(Items[I]).SaveToNode(NewNode);
+    Items[I].SaveToNode(NewNode);
   end;
 end;
@@ -825 +823 @@
 
   for I := 0 to Cells.Count - 1 do
-  with TPlayerCell(Cells[I]) do begin
+  with Cells[I] do begin
     List := Cells;
     Explored := False;
     InVisibleRange := False;
-    MapCell := TCell(Player.Game.Map.Cells[I]);
+    MapCell := Player.Game.Map.Cells[I];
   end;
 end;
@@ -852 +850 @@
 begin
   for I := 0 to Cells.Count - 1 do
-  with TPlayerCell(Cells[I]) do begin
+  with Cells[I] do begin
     NeighCount := 0;
     for C := 0 to MapCell.Neighbors.Count - 1 do
-      if TCell(MapCell.Neighbors[C]).Player = Player then
+      if MapCell.Neighbors[C].Player = Player then
         Inc(NeighCount);
 
-    InVisibleRange := (NeighCount > 0) or (TCell(MapCell).Player = Player);
+    InVisibleRange := (NeighCount > 0) or (MapCell.Player = Player);
     if InVisibleRange and not Explored then Explored := True;
   end;
@@ -999 +997 @@
 begin
   for I := 0 to Count - 1 do
-  TCell(Items[I]).FixRefId;
+    Items[I].FixRefId;
 end;
 
@@ -1007 +1005 @@
 begin
   I := 0;
-  while (I < Count) and (TCell(Items[I]).Id <> Id) do Inc(I);
-  if I < Count then Result := TCell(Items[I])
+  while (I < Count) and (Items[I].Id <> Id) do Inc(I);
+  if I < Count then Result := Items[I]
     else Result := nil;
 end;
@@ -1044 +1042 @@
 begin
   for I := 0 to Count - 1 do
-  with TCell(Items[I]) do begin
+  with Items[I] do begin
     NewNode2 := Node.OwnerDocument.CreateElement('Cell');
     Node.AppendChild(NewNode2);
@@ -1090 +1088 @@
 begin
   I := 0;
-  while (I < Count) and (TPlayer(Items[I]).Id <> Id) do Inc(I);
-  if I < Count then Result := TPlayer(Items[I])
+  while (I < Count) and (Items[I].Id <> Id) do Inc(I);
+  if I < Count then Result := Items[I]
     else Result := nil;
 end;
@@ -1140 +1138 @@
     NewNode := Node.OwnerDocument.CreateElement('Player');
     Node.AppendChild(NewNode);
-    TPlayer(Items[I]).SaveToNode(NewNode);
+    Items[I].SaveToNode(NewNode);
   end;
 end;
@@ -1155 +1153 @@
 begin
   I := 0;
-  while (I < Count) and (TPlayer(Items[I]).Mode <> pmHuman) do Inc(I);
-  if I < Count then Result := TPlayer(Items[I])
+  while (I < Count) and (Items[I].Mode <> pmHuman) do Inc(I);
+  if I < Count then Result := Items[I]
     else Result := nil;
 end;
@@ -1169 +1167 @@
     Add(TPlayer.Create);
   for I := 0 to Count - 1 do begin
-    TPlayer(Items[I]).Assign(TPlayer(Source[I]));
-    TPlayer(Items[I]).Game := Game;
+    Items[I].Assign(Source[I]);
+    Items[I].Game := Game;
   end;
   NewPlayerId := Source.NewPlayerId;
@@ -1188 +1186 @@
       for I := 0 to Count - 1 do begin
         Items[I] := TPlayer.Create;
-        TPlayer(Items[I]).Id := GetNewPlayerId;
-        TPlayer(Items[I]).Game := Game;
-        TPlayer(Items[I]).LoadConfig(Config, Path + '/Player' + IntToStr(I));
+        Items[I].Id := GetNewPlayerId;
+        Items[I].Game := Game;
+        Items[I].LoadConfig(Config, Path + '/Player' + IntToStr(I));
       end;
     end;
@@ -1201 +1199 @@
 begin
   for I := 0 to Count - 1 do
-    TPlayer(Items[I]).SaveConfig(Config, Path + '/Player' + IntToStr(I));
+    Items[I].SaveConfig(Config, Path + '/Player' + IntToStr(I));
   with Config do begin
     SetValue(DOMString(Path + '/Count'), Count);
@@ -1385 +1383 @@
   for I := 0 to Cells.Count - 1 do begin
     Cells[I] := TCell.Create;
-    TCell(Cells[I]).Map := Self;
-    TCell(Cells[I]).Assign(TCell(Source.Cells[I]));
+    Cells[I].Map := Self;
+    Cells[I].Assign(Source.Cells[I]);
   end;
   }
@@ -1442 +1440 @@
   Result := nil;
   for I := 0 to Cells.Count - 1 do
-  if TCell(Cells[I]).Terrain <> ttVoid then begin
-    if TCell(Cells[I]).Polygon.IsPointInside(Pos) then begin
-      Result := TCell(Cells[I]);
+  if Cells[I].Terrain <> ttVoid then begin
+    if Cells[I].Polygon.IsPointInside(Pos) then begin
+      Result := Cells[I];
       Exit;
     end;
@@ -1462 +1460 @@
 begin
   for I := 0 to Cells.Count - 1 do
-  with TCell(Cells[I]) do begin
+  with Cells[I] do begin
     if (Player = APlayer) and ((Game.GrowCells = gcPlayerAll) or
     ((Game.GrowCells = gcPlayerCities) and (Terrain = ttCity))) then begin
@@ -1588 +1586 @@
   // Generic way to create two sides symetric map independent to shape
   for C := 0 to (Cells.Count div 2) - 1 do begin
-    TCell(Cells[C]).Terrain := TCell(Cells[Cells.Count - 1 - C]).Terrain;
-    TCell(Cells[C]).Power := TCell(Cells[Cells.Count - 1 - C]).Power;
-
-    for I := TCell(Cells[C]).Links.Count - 1 downto 0 do begin
-      CellLink := TCell(Cells[C]).Links[I];
+    Cells[C].Terrain := Cells[Cells.Count - 1 - C].Terrain;
+    Cells[C].Power := Cells[Cells.Count - 1 - C].Power;
+
+    for I := Cells[C].Links.Count - 1 downto 0 do begin
+      CellLink := Cells[C].Links[I];
 
       // Remove cells on first half of the map
@@ -1624 +1622 @@
   for C := 0 to (Cells.Count div 2) - 1 do begin
     // Make copy of links from second half
-    OppositeCell := TCell(Cells[Cells.Count - 1 - C]);
+    OppositeCell := Cells[Cells.Count - 1 - C];
     for CellLink in OppositeCell.Links do
       if (Cells.IndexOf(CellLink.Cells[0]) > (Cells.Count div 2)) and
@@ -1687 +1685 @@
   // This is generic algorithm to determine pixel size of entire map
   for I := 0 to Cells.Count - 1 do begin
-    CellRect := TCell(Cells[I]).Polygon.GetRect;
+    CellRect := Cells[I].Polygon.GetRect;
     if I = 0 then Result := CellRect
       else begin
@@ -1935 +1933 @@
     NewNode2 := NewNode.OwnerDocument.CreateElement('Neighbour');
     NewNode.AppendChild(NewNode2);
-    WriteInteger(NewNode2, 'Id', TCell(Neighbors[I]).Id);
+    WriteInteger(NewNode2, 'Id', Neighbors[I].Id);
   end;
   NewNode := Node.OwnerDocument.CreateElement('Polygon');
@@ -2028 +2026 @@
   FreeAndNil(Links);
   for I := Neighbors.Count - 1 downto 0 do
-    if TCell(Neighbors[I]).Neighbors.Remove(Self) = -1 then
+    if Neighbors[I].Neighbors.Remove(Self) = -1 then
       raise Exception.Create(SCellRemoveNeighborError);
   FreeAndNil(Neighbors);
@@ -2435 +2433 @@
   // Get list of all enemy border cells
   for C := 0 to AllCells.Count - 1 do
-  with TCell(AllCells[C]) do begin
+  with AllCells[C] do begin
     if (Player <> Game.CurrentPlayer) and (Player <> nil) and (Terrain <> ttVoid) then begin
       CanAttack := 0;
       for I := 0 to Neighbors.Count - 1 do
-      if ((TCell(Neighbors[I]).Player = Game.CurrentPlayer) or
-      (TCell(Neighbors[I]).Player = nil)) and (TCell(Neighbors[I]).Terrain <> ttVoid) then begin
+      if ((Neighbors[I].Player = Game.CurrentPlayer) or
+      (Neighbors[I].Player = nil)) and (Neighbors[I].Terrain <> ttVoid) then begin
         Inc(CanAttack);
       end;
@@ -2458 +2456 @@
     // Set mark for selected border cells
     for C := 0 to TargetCells.Count - 1 do
-      TCell(TargetCells[C]).Mark := True;
+      TargetCells[C].Mark := True;
 
     // Move all power from unmarked cells and mark them
     NewTargetCells.Count := 0;
     for C := 0 to TargetCells.Count - 1 do
-    with TCell(TargetCells[C]) do begin
+    with TargetCells[C] do begin
       for I := 0 to Neighbors.Count - 1 do begin
-        if (TCell(Neighbors[I]).Terrain <> ttVoid) and (not TCell(Neighbors[I]).Mark) then begin
-          if (TCell(TargetCells[C]).Player = Game.CurrentPlayer) and
-          (TCell(Neighbors[I]).Player = Game.CurrentPlayer) then begin
+        if (Neighbors[I].Terrain <> ttVoid) and (not Neighbors[I].Mark) then begin
+          if (TargetCells[C].Player = Game.CurrentPlayer) and
+          (Neighbors[I].Player = Game.CurrentPlayer) then begin
             // Do not take units from front line
-            Cells2 := TCell(Neighbors[I]).Neighbors;
+            Cells2 := Neighbors[I].Neighbors;
             CanAttack := 0;
             for J := 0 to Cells2.Count - 1 do
-            if ((TCell(Cells2[J]).Player <> Game.CurrentPlayer) or (TCell(Cells2[J]).Player = nil))
-            and (TCell(Cells2[J]).Terrain <> ttVoid) then begin
+            if ((Cells2[J].Player <> Game.CurrentPlayer) or (Cells2[J].Player = nil))
+            and (Cells2[J].Terrain <> ttVoid) then begin
               Inc(CanAttack);
             end;
             if CanAttack = 0 then begin
-              MovedPower := TCell(Neighbors[I]).GetAvialPower;
-              if (TCell(TargetCells[C]).GetAvialPower + TCell(TargetCells[C]).GetAttackPower + MovedPower) > Game.Map.MaxPower then
-                MovedPower := Game.Map.MaxPower - TCell(TargetCells[C]).GetAvialPower - TCell(TargetCells[C]).GetAttackPower;
-              Player.SetMove(TCell(Neighbors[I]), TCell(TargetCells[C]), MovedPower, False);
+              MovedPower := Neighbors[I].GetAvialPower;
+              if (TargetCells[C].GetAvialPower + TargetCells[C].GetAttackPower + MovedPower) > Game.Map.MaxPower then
+                MovedPower := Game.Map.MaxPower - TargetCells[C].GetAvialPower - TargetCells[C].GetAttackPower;
+              Player.SetMove(Neighbors[I], TargetCells[C], MovedPower, False);
             end;
           end;
-          TCell(Neighbors[I]).Mark := True;
-          NewTargetCells.Add(TCell(Neighbors[I]));
+          Neighbors[I].Mark := True;
+          NewTargetCells.Add(Neighbors[I]);
         end;
       end;
@@ -2539 +2537 @@
   // Get list of border cells
   for C := 0 to AllCells.Count - 1 do
-  with TCell(AllCells[C]) do begin
+  with AllCells[C] do begin
     if (Terrain <> ttVoid) and (Player = Game.CurrentPlayer)  then begin
-      if AttackersCount(TCell(AllCells[C])) > 0 then
+      if AttackersCount(AllCells[C]) > 0 then
         BorderCells.Add(AllCells[C]);
     end;
@@ -2548 +2546 @@
   // Move all units back to inner area from weak border cells
   for C := 0 to BorderCells.Count - 1 do
-  with TCell(BorderCells[C]) do begin
+  with BorderCells[C] do begin
     // Calculate enemy power
     // TODO: Do not sum different enemy power to one value
     EnemyPower := 0;
     for I := 0 to Neighbors.Count - 1 do
-    if (TCell(Neighbors[I]).Player <> Game.CurrentPlayer) and (TCell(Neighbors[I]).Player <> nil) then begin
-      Inc(EnemyPower, TCell(Neighbors[I]).Power);
+    if (Neighbors[I].Player <> Game.CurrentPlayer) and (Neighbors[I].Player <> nil) then begin
+      Inc(EnemyPower, Neighbors[I].Power);
     end;
     if EnemyPower > (GetAvialPower + GetAttackPower) then begin
@@ -2561 +2559 @@
         Player.Moves.Remove(MovesTo[I]);
       for I := 0 to Neighbors.Count - 1 do
-      if (TCell(Neighbors[I]).Player = Player) and (AttackersCount(TCell(Neighbors[I])) = 0) then begin
-        Player.SetMove(TCell(BorderCells[C]), TCell(Neighbors[I]), GetAvialPower, False);
+      if (Neighbors[I].Player = Player) and (AttackersCount(Neighbors[I]) = 0) then begin
+        Player.SetMove(BorderCells[C], Neighbors[I], GetAvialPower, False);
         Break;
       end;
@@ -2577 +2575 @@
   Result := 0;
   for I := 0 to Cell.Neighbors.Count - 1 do
-  if (TCell(Cell.Neighbors[I]).Player <> Game.CurrentPlayer) and
-    (TCell(Cell.Neighbors[I]).Player <> nil) then begin
+  if (Cell.Neighbors[I].Player <> Game.CurrentPlayer) and
+    (Cell.Neighbors[I].Player <> nil) then begin
       Inc(Result);
   end;
@@ -2828 +2826 @@
 
   for C := 0 to List.Count - 1 do
-  with TCell(List[C]) do begin
+  with List[C] do begin
     for I := 0 to Neighbors.Count - 1 do
-    with TCell(Neighbors[I]) do
+    with Neighbors[I] do
     if (not Mark) and (Terrain <> ttVoid) and (Area <> SourceArea) and ((DestArea = nil) or (DestArea = Area)) then begin
-      NewList.Add(TCell(TCell(List[C]).Neighbors[I]));
+      NewList.Add(List[C].Neighbors[I]);
       Mark := True;
     end else
     if (not Mark) and (Terrain = ttVoid) then begin
-      NewListVoid.Add(TCell(TCell(List[C]).Neighbors[I]));
+      NewListVoid.Add(List[C].Neighbors[I]);
       Mark := True;
     end;
@@ -2843 +2841 @@
   if NewList.Count > 0 then begin
     // We found cell with different area
-    Result := TCell(NewList[Random(NewList.Count)]);
+    Result := NewList[Random(NewList.Count)];
   end else
   if NewListVoid.Count > 0 then begin
@@ -2878 +2876 @@
     for J := 0 to 4 do begin
 
-    Cell := TCell(BorderList[Random(BorderList.Count)]);
+    Cell := BorderList[Random(BorderList.Count)];
     List.Clear;
     List.Add(Cell);
@@ -2913 +2911 @@
 begin
   for C := 0 to Cells.Count - 1 do
-  with TCell(Cells[C]) do
+  with Cells[C] do
     Area := nil;
   Areas.Clear;
   for C := 0 to Cells.Count - 1 do
-  with TCell(Cells[C]) do
+  with Cells[C] do
   if (Terrain <> ttVoid) and (not Assigned(Area)) then begin
     NewArea := TMapArea.Create;
@@ -3060 +3058 @@
     mtTriangle: Map := TTriangleMap.Create;
     mtVoronoi: Map := TVoronoiMap.Create;
+    mtIsometric: Map := TIsometricMap.Create;
     else Map := TMap.Create;
   end;
@@ -3128 +3127 @@
       // Remove cells already allocated to different player
       for I := List.Count - 1 downto 0 do
-        if Assigned(TCell(List[I]).Player) then
+        if Assigned(List[I].Player) then
           List.Delete(I);
 
@@ -3277 +3276 @@
       if Assigned(NewNode) then
         Players.LoadFromNode(NewNode);
-      if Players.Count > 0 then CurrentPlayer := TPlayer(Players[0])
+      if Players.Count > 0 then CurrentPlayer := Players[0]
         else CurrentPlayer := nil;
 
@@ -3283 +3282 @@
 
       for I := 0 to Players.Count - 1 do begin
-        TPlayer(Players[I]).PlayerMap.Update;
-        TPlayer(Players[I]).PlayerMap.CheckVisibility;
+        Players[I].PlayerMap.Update;
+        Players[I].PlayerMap.CheckVisibility;
       end;
       Running := ReadBoolean(RootNode, 'Running', True);
@@ -3341 +3340 @@
 begin
   for I := 0 to Players.Count - 1 do
-  with TPlayer(Players[I]) do begin
+  with Players[I] do begin
     TotalUnits := 0;
     TotalCells := 0;
@@ -3348 +3347 @@
     TotalDiscovered := 0;
     for J := 0 to PlayerMap.Cells.Count - 1 do
-    with TPlayerCell(PlayerMap.Cells[J]) do begin
+    with PlayerMap.Cells[J] do begin
       if Explored then Inc(TotalDiscovered);
     end;
@@ -3362 +3361 @@
 begin
   for I := 0 to Players.Count - 1 do
-  with TPlayer(Players[I]) do begin
+  with Players[I] do begin
     NewStat := TGameTurnStat.Create;
     NewStat.DiscoveredCells := TotalDiscovered;
@@ -3384 +3383 @@
   // Skip dead players
   repeat
-    CurrentPlayer := TPlayer(Players[(Players.IndexOf(CurrentPlayer) + 1) mod Players.Count]);
+    CurrentPlayer := Players[(Players.IndexOf(CurrentPlayer) + 1) mod Players.Count];
     if Assigned(FOnPlayerChange) then
       FOnPlayerChange(Self);
@@ -3412 +3411 @@
     AlivePlayers := Players.GetAlivePlayers;
     if (Length(AlivePlayers) <= 1) then begin
-      if Length(AlivePlayers) > 0 then Winner := TPlayer(AlivePlayers[0]);
+      if Length(AlivePlayers) > 0 then Winner := AlivePlayers[0];
       EndGame(Winner);
     end;
@@ -3419 +3418 @@
     AlivePlayers := Players.GetAlivePlayersWithCities;
     if (Length(AlivePlayers) <= 1) then begin
-      if Length(AlivePlayers) > 0 then Winner := TPlayer(AlivePlayers[0]);
+      if Length(AlivePlayers) > 0 then Winner := AlivePlayers[0];
       EndGame(Winner);
     end;
@@ -3498 +3497 @@
       if Assigned(Player.StartCell) then begin
         if SymetricMap and (I = 1) then
-          StartCell := TCell(Map.Cells[Map.Cells.Count - 1 - Map.Cells.IndexOf(TPlayer(Players[0]).StartCell)]);
+          StartCell := Map.Cells[Map.Cells.Count - 1 - Map.Cells.IndexOf(Players[0].StartCell)];
 
         StartCell.Terrain := ttCity;
@@ -3508 +3507 @@
     Inc(I);
   end;
-  if Players.Count > 0 then CurrentPlayer := TPlayer(Players[0])
+  if Players.Count > 0 then CurrentPlayer := Players[0]
     else CurrentPlayer := nil;
 

trunk/UMap.pas

@@ -19 +19 @@
   THexMap = class(TMap)
   private
+    const
+      CellMulX = 1.12;
+      CellMulY = 1.292;
     function IsCellsPosNeighbor(CellPos1, CellPos2: TPoint): Boolean;
     procedure GetCellPosNeighbors(CellPos: TPoint; Neighbours: TCells);
@@ -57 +60 @@
   end;
 
+  { TIsometricMap }
+
+  TIsometricMap = class(TMap)
+  private
+    const
+      CellMulX = 0.95;
+      CellMulY = 3.35;
+    function GetTilePolygon(Pos: TPoint; Size: TPoint): TPolygon;
+  public
+    function IsValidIndex(Index: TPoint): Boolean; override;
+    procedure Generate; override;
+  end;
+
+
 implementation
+
+{ TIsometricMap }
+
+function TIsometricMap.GetTilePolygon(Pos: TPoint; Size: TPoint): TPolygon;
+begin
+  SetLength(Result.Points, 4);
+  Result.Points[0] := TPoint.Create(Pos.X, Trunc(Pos.Y - Size.Y / 3.5));
+  Result.Points[1] := TPoint.Create(Trunc(Pos.X + Size.X / 2), Pos.Y);
+  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;
+
+function TIsometricMap.IsValidIndex(Index: TPoint): Boolean;
+begin
+  Result := (Index.X >= 0) and (Index.X < Size.X) and
+    (Index.Y >= 0) and (Index.Y < Size.Y);
+end;
+
+procedure TIsometricMap.Generate;
+var
+  X, Y: Integer;
+  NewCell: TCell;
+  PX, PY: Double;
+  P: TPoint;
+begin
+  Clear;
+
+  // Allocate and init new
+  Cells.Count := Size.Y * Size.X;
+  for Y := 0 to Size.Y - 1 do
+  for X := 0 to Size.X - 1 do begin
+    NewCell := TCell.Create;
+    NewCell.Map := Self;
+    PX := X;
+    PY := Y;
+    if (Y and 1) = 1 then begin
+      PX := PX + 0.5;
+      //Y := Y + 0.5;
+    end;
+    NewCell.PosPx := TPoint.Create(Trunc(PX * DefaultCellSize.X / CellMulX),
+      Trunc(PY * DefaultCellSize.Y / CellMulY));
+    NewCell.Polygon := GetTilePolygon(NewCell.PosPx, DefaultCellSize);
+    NewCell.Id := GetNewCellId;
+    Cells[Y * Size.X + X] := NewCell;
+  end;
+
+  // Generate neightbours
+  for Y := 0 to Size.Y - 1 do
+  for X := 0 to Size.X - 1 do
+  with Cells[Y * Size.X + X] do begin
+    P := TPoint.Create(X + 0 + (Y mod 2), Y + 1);
+    if IsValidIndex(P) then Neighbors.Add(Cells[P.Y * Size.X + P.X]);
+    P := TPoint.Create(X - 1 + (Y mod 2), Y + 1);
+    if IsValidIndex(P) then Neighbors.Add(Cells[P.Y * Size.X + P.X]);
+    P := TPoint.Create(X + 0 + (Y mod 2), Y - 1);
+    if IsValidIndex(P) then Neighbors.Add(Cells[P.Y * Size.X + P.X]);
+    P := TPoint.Create(X - 1 + (Y mod 2), Y - 1);
+    if IsValidIndex(P) then Neighbors.Add(Cells[P.Y * Size.X + P.X]);
+  end;
+
+  FPixelRect := CalculatePixelRect;
+end;
 
 { THexMap }
@@ -136 +215 @@
 var
   X, Y: Integer;
+  P: TPoint;
 begin
   Neighbours.Count := 0;
   for Y := -1 to 1 do
-  for X := -1 to 1 do
-  if IsValidIndex(TPoint.Create(CellPos.X + X, CellPos.Y + Y)) and
-  IsCellsPosNeighbor(CellPos, TPoint.Create((CellPos.X + X), (CellPos.Y + Y))) then begin
-    Neighbours.Add(TCell(Cells[(CellPos.Y + Y) * Size.X + (CellPos.X + X)]));
+  for X := -1 to 1 do begin
+    P := TPoint.Create(CellPos.X + X, CellPos.Y + Y);
+    if IsValidIndex(P) and IsCellsPosNeighbor(CellPos, P) then begin
+      Neighbours.Add(Cells[P.Y * Size.X + P.X]);
+    end;
   end;
 end;
@@ -166 +247 @@
       //Y := Y + 0.5;
     end;
-    NewCell.PosPx := TPoint.Create(Trunc(PX * DefaultCellSize.X / HexCellMulX),
-      Trunc(PY * DefaultCellSize.Y / HexCellMulY));
+    NewCell.PosPx := TPoint.Create(Trunc(PX * DefaultCellSize.X / CellMulX),
+      Trunc(PY * DefaultCellSize.Y / CellMulY));
     NewCell.Polygon := GetHexagonPolygon(NewCell.PosPx, DefaultCellSize);
     NewCell.Id := GetNewCellId;
@@ -176 +257 @@
   for Y := 0 to Size.Y - 1 do
   for X := 0 to Size.X - 1 do
-  with TCell(Cells[Y * Size.X + X]) do begin
+  with Cells[Y * Size.X + X] do begin
     GetCellPosNeighbors(TPoint.Create(X, Y), Neighbors);
   end;
@@ -190 +271 @@
   X, Y: Integer;
   NewCell: TCell;
+  P: TPoint;
 begin
   Clear;
@@ -209 +291 @@
   for Y := 0 to Size.Y - 1 do
   for X := 0 to Size.X - 1 do
-  with TCell(Cells[Y * Size.X + X]) do begin
-    if IsValidIndex(TPoint.Create(X + 1, Y + 0)) then
-      Neighbors.Add(TCell(Cells[(Y + 0) * Size.X + (X + 1)]));
-    if IsValidIndex(TPoint.Create(X + 0, Y + 1)) then
-      Neighbors.Add(TCell(Cells[(Y + 1) * Size.X + (X + 0)]));
-    if IsValidIndex(TPoint.Create(X - 1, Y + 0)) then
-      Neighbors.Add(TCell(Cells[(Y + 0) * Size.X + (X - 1)]));
-    if IsValidIndex(TPoint.Create(X + 0, Y - 1)) then
-      Neighbors.Add(TCell(Cells[(Y - 1) * Size.X + (X + 0)]));
+  with Cells[Y * Size.X + X] do begin
+    P := TPoint.Create(X + 1, Y + 0);
+    if IsValidIndex(P) then Neighbors.Add(Cells[P.Y * Size.X + P.X]);
+    P := TPoint.Create(X + 0, Y + 1);
+    if IsValidIndex(P) then Neighbors.Add(Cells[P.Y * Size.X + P.X]);
+    P := TPoint.Create(X - 1, Y + 0);
+    if IsValidIndex(P) then Neighbors.Add(Cells[P.Y * Size.X + P.X]);
+    P := TPoint.Create(X + 0, Y - 1);
+    if IsValidIndex(P) then Neighbors.Add(Cells[P.Y * Size.X + P.X]);
   end;
 
@@ -332 +414 @@
   Reverse: Boolean;
   NewCell: TCell;
+  P: TPoint;
 begin
   Clear;
@@ -354 +437 @@
   for Y := 0 to Self.Size.Y - 1 do
   for X := 0 to Size.X - 1 do
-  with TCell(Cells[Y * Size.X + X]) do begin
+  with Cells[Y * Size.X + X] do begin
     if Boolean(X mod 2) xor Boolean(Y mod 2) then Rev := -1
       else Rev := 1;
-    if IsValidIndex(TPoint.Create(X + 1, Y + 0)) then
-      Neighbors.Add(TCell(Cells[(Y + 0) * Size.X + (X + 1)]));
-    if IsValidIndex(TPoint.Create(X + 0, Y - 1 * Rev)) then
-      Neighbors.Add(TCell(Cells[(Y - 1 * Rev) * Size.X + (X + 0)]));
-    if IsValidIndex(TPoint.Create(X - 1, Y + 0)) then
-      Neighbors.Add(TCell(Cells[(Y + 0) * Size.X + (X - 1)]));
+    P := TPoint.Create(X + 1, Y + 0);
+    if IsValidIndex(P) then Neighbors.Add(Cells[P.Y * Size.X + P.X]);
+    P := TPoint.Create(X + 0, Y - 1 * Rev);
+    if IsValidIndex(P) then Neighbors.Add(Cells[P.Y * Size.X + P.X]);
+    P := TPoint.Create(X - 1, Y + 0);
+    if IsValidIndex(P) then Neighbors.Add(Cells[P.Y * Size.X + P.X]);
   end;