Changeset 20 for trunk/Forms

Timestamp:

Oct 5, 2019, 2:00:50 PM (5 years ago)

Author:

chronos

Message:

• Added: Player can undo last move.
• Modified: Optimized code of TGame.CanMove method.

Location:

trunk/Forms

Files:

• UFormMain.lfm (modified) (1 diff)
• UFormMain.pas (modified) (2 diffs)
• UFormNew.lfm (modified) (1 diff)
• UFormNew.pas (modified) (1 diff)

trunk/Forms/UFormMain.lfm

@@ -20 +20 @@
       Caption = 'Game'
       object MenuItemNew: TMenuItem
-        Action = Core.AGameNew
+        Action = Core.ANew
+      end
+      object MenuItem2: TMenuItem
+        Action = Core.AUndo
       end
       object MenuItem1: TMenuItem

trunk/Forms/UFormMain.pas

@@ -16 +16 @@
     MainMenu1: TMainMenu;
     MenuItem1: TMenuItem;
+    MenuItem2: TMenuItem;
     MenuItemNew: TMenuItem;
     MenuItemExit: TMenuItem;
@@ -48 +49 @@
 
 procedure TFormMain.FormKeyUp(Sender: TObject; var Key: Word; Shift: TShiftState);
-var
-  MovedCount: Integer;
 begin
   if Core.Game.Running and not Core.Game.Moving then begin
-    MovedCount := 0;
     case Key of
-      37: MovedCount := Core.Game.MoveAll(drLeft);
-      38: MovedCount := Core.Game.MoveAll(drUp);
-      39: MovedCount := Core.Game.MoveAll(drRight);
-      40: MovedCount := Core.Game.MoveAll(drDown);
+      37: Core.Game.MoveAll(drLeft);
+      38: Core.Game.MoveAll(drUp);
+      39: Core.Game.MoveAll(drRight);
+      40: Core.Game.MoveAll(drDown);
     end;
-    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.Board.GetHighestTileValue >= 2048) then
-      Core.Game.Win;
   end;
 end;

trunk/Forms/UFormNew.lfm

@@ -25 +25 @@
     ItemHeight = 0
     Items.Strings = (
+      '2 x 2'
       '3 x 3'
       '4 x 4'

trunk/Forms/UFormNew.pas

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