Changeset 11 for trunk/Forms/UFormMain.pas

Timestamp:

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

Author:

chronos

Message:

• Added: Configurable speed of animations.

File:

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

trunk/Forms/UFormMain.pas

@@ -14 +14 @@
 
   TFormMain = class(TForm)
-    AAbout: TAction;
-    AExit: TAction;
-    AGameNew: TAction;
-    ActionList1: TActionList;
     MainMenu1: TMainMenu;
+    MenuItem1: TMenuItem;
     MenuItemNew: TMenuItem;
     MenuItemExit: TMenuItem;
@@ -24 +21 @@
     MenuItemAbout: TMenuItem;
     MenuItemGame: TMenuItem;
-    procedure AAboutExecute(Sender: TObject);
-    procedure AExitExecute(Sender: TObject);
-    procedure AGameNewExecute(Sender: TObject);
+    TimerDraw: TTimer;
     procedure FormClose(Sender: TObject; var CloseAction: TCloseAction);
     procedure FormCreate(Sender: TObject);
@@ -33 +28 @@
     procedure FormPaint(Sender: TObject);
     procedure FormShow(Sender: TObject);
+    procedure TimerDrawTimer(Sender: TObject);
   private
+    RedrawPending: Boolean;
   public
+    procedure Redraw;
   end;
 
@@ -45 +43 @@
 
 uses
-  UCore, UFormNew, UFormAbout;
+  UCore;
 
 { TFormMain }
@@ -53 +51 @@
   MovedCount: Integer;
 begin
-  if Core.Game.Running then begin
+  if Core.Game.Running and not Core.Game.Moving then begin
     MovedCount := 0;
     case Key of
@@ -72 +70 @@
 end;
 
-procedure TFormMain.AGameNewExecute(Sender: TObject);
-begin
-  FormNew := TFormNew.Create(nil);
-  try
-    FormNew.Load(Core.Game);
-    if FormNew.ShowModal = mrOk then begin
-      FormNew.Save(Core.Game);
-      Core.Game.New;
-    end;
-  finally
-    FreeAndNil(FormNew);
-  end;
-end;
-
 procedure TFormMain.FormClose(Sender: TObject; var CloseAction: TCloseAction);
 begin
   Core.PersistentForm1.Save(Self);
-end;
-
-procedure TFormMain.AExitExecute(Sender: TObject);
-begin
-  Close;
-end;
-
-procedure TFormMain.AAboutExecute(Sender: TObject);
-begin
-  FormAbout := TFormAbout.Create(nil);
-  try
-    FormAbout.ApplicationInfo := Core.ApplicationInfo1;
-    FormAbout.ShowModal;
-  finally
-    FreeAndNil(FormAbout);
-  end;
 end;
 
@@ -122 +90 @@
 end;
 
+procedure TFormMain.TimerDrawTimer(Sender: TObject);
+begin
+  if RedrawPending then begin
+    RedrawPending := False;
+    Repaint;
+  end;
+end;
+
+procedure TFormMain.Redraw;
+begin
+  RedrawPending := True;
+end;
+
 end.