Changeset 10 for trunk/Forms

Timestamp:

Oct 4, 2019, 11:05:35 PM (5 years ago)

Author:

chronos

Message:

• Added: Show Top score and remember it after application restart.

File:

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

trunk/Forms/UFormMain.pas

@@ -35 +35 @@
   private
   public
-    Game: TGame;
-    procedure GameChange(Sender: TObject);
   end;
 
@@ -55 +53 @@
   MovedCount: Integer;
 begin
-  if Game.Running then begin
+  if Core.Game.Running then begin
     MovedCount := 0;
     case Key of
-      37: MovedCount := Game.MoveAll(drLeft);
-      38: MovedCount := Game.MoveAll(drUp);
-      39: MovedCount := Game.MoveAll(drRight);
-      40: MovedCount := Game.MoveAll(drDown);
+      37: MovedCount := Core.Game.MoveAll(drLeft);
+      38: MovedCount := Core.Game.MoveAll(drUp);
+      39: MovedCount := Core.Game.MoveAll(drRight);
+      40: MovedCount := Core.Game.MoveAll(drDown);
     end;
-    if MovedCount > 0 then Game.FillRandomCell;
-    if not Game.CanMove and (Game.GetEmptyCellsCount = 0) then
-      Game.GameOver;
+    if MovedCount > 0 then Core.Game.FillRandomCell;
+    if not Core.Game.CanMove and (Core.Game.GetEmptyCellsCount = 0) then
+      Core.Game.GameOver;
   end;
 end;
@@ -71 +69 @@
 procedure TFormMain.FormPaint(Sender: TObject);
 begin
-  Game.Render(Canvas, Point(Width, Height - MainMenu1.Height));
+  Core.Game.Render(Canvas, Point(Width, Height - MainMenu1.Height));
 end;
 
@@ -78 +76 @@
   FormNew := TFormNew.Create(nil);
   try
-    FormNew.Load(Game);
+    FormNew.Load(Core.Game);
     if FormNew.ShowModal = mrOk then begin
-      FormNew.Save(Game);
-      Game.New;
+      FormNew.Save(Core.Game);
+      Core.Game.New;
     end;
   finally
@@ -111 +109 @@
 procedure TFormMain.FormCreate(Sender: TObject);
 begin
-  Randomize;
-  Game := TGame.Create;
-  Game.Size := Point(4, 4);
-  Game.OnChange := GameChange;
 end;
 
 procedure TFormMain.FormDestroy(Sender: TObject);
 begin
-  Game.Free;
 end;
 
@@ -126 +119 @@
   Core.PersistentForm1.RegistryContext := Core.ApplicationInfo1.GetRegistryContext;
   Core.PersistentForm1.Load(Self);
-  Game.New;
-  {
-  Game.Cells[0, 0].Value := 1;
-  Game.Cells[0, 1].Value := 2;
-  Game.Cells[0, 2].Value := 3;
-  Game.Cells[1, 0].Value := 4;
-  Game.Cells[1, 1].Value := 5;
-  Game.Cells[1, 2].Value := 6;
-  Game.Cells[2, 0].Value := 7;
-  Game.Cells[2, 1].Value := 8;
-  Game.Cells[2, 2].Value := 9;
-  }
-end;
-
-procedure TFormMain.GameChange(Sender: TObject);
-begin
-  Repaint;
+  Core.Game.New;
 end;