Changeset 20 for trunk/Forms/UFormMain.pas

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.

File:

• trunk/Forms/UFormMain.pas (modified) (2 diffs)

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;