Changeset 17 for trunk/Forms

Timestamp:

Oct 5, 2019, 12:17:17 PM (5 years ago)

Author:

chronos

Message:

• Modified: Tiles matrix moved to separate class called TBoard.

Location:

trunk/Forms

Files:

• UFormMain.pas (modified) (1 diff)
• UFormNew.pas (modified) (1 diff)

trunk/Forms/UFormMain.pas

@@ -59 +59 @@
       40: MovedCount := Core.Game.MoveAll(drDown);
     end;
-    if MovedCount > 0 then Core.Game.FillRandomCell;
-    if not Core.Game.CanMove and (Core.Game.GetEmptyCellsCount = 0) then
+    if MovedCount > 0 then Core.Game.FillRandomTile;
+    if not Core.Game.CanMove and (Core.Game.Board.GetEmptyTilesCount = 0) then
       Core.Game.GameOver;
-    if (not Core.Game.Won) and (Core.Game.GetHighestCellValue >= 2048) then
+    if (not Core.Game.Won) and (Core.Game.Board.GetHighestTileValue >= 2048) then
       Core.Game.Win;
   end;

trunk/Forms/UFormNew.pas

@@ -45 +45 @@
 procedure TFormNew.Load(Game: TGame);
 begin
-  ComboBoxSize.ItemIndex := Game.Size.X - 3;
+  ComboBoxSize.ItemIndex := Game.Board.Size.X - 3;
 end;
 
 procedure TFormNew.Save(Game: TGame);
 begin
-  Game.Size := Point(3 + ComboBoxSize.ItemIndex, 3 + ComboBoxSize.ItemIndex);
+  Game.Board.Size := Point(3 + ComboBoxSize.ItemIndex, 3 + ComboBoxSize.ItemIndex);
 end;