Changeset 23 for trunk/Forms/UMainForm.pas

Timestamp:

Sep 28, 2011, 8:34:06 PM (13 years ago)

Author:

george

Message:

• Added: Introduced player pool for selection of players for new game.
• Fixed: Deadlock on program exit during threads termination.

File:

• trunk/Forms/UMainForm.pas (modified) (5 diffs)

trunk/Forms/UMainForm.pas

@@ -43 +43 @@
     procedure FormClose(Sender: TObject; var CloseAction: TCloseAction);
     procedure FormCreate(Sender: TObject);
+    procedure FormDestroy(Sender: TObject);
     procedure FormDeactivate(Sender: TObject);
-    procedure FormDestroy(Sender: TObject);
     procedure FormKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState);
     procedure FormKeyUp(Sender: TObject; var Key: Word; Shift: TShiftState);
@@ -60 +60 @@
   public
     PersistentForm: TPersistentForm;
+    Engine: TEngine;
   end; 
 
@@ -85 +86 @@
     try
       Engine.Lock.Acquire;
-      StatusBar1.Panels[1].Text := IntToStr(TPlayer(Engine.Players[0]).Position.X) + ', ' +
-        IntToStr(TPlayer(Engine.Players[0]).Position.Y) + ' ' +
-        IntToStr(TPlayer(Engine.Players[0]).Direction);
+      //StatusBar1.Panels[1].Text := IntToStr(TPlayer(Engine.Players[0]).Position.X) + ', ' +
+      //  IntToStr(TPlayer(Engine.Players[0]).Position.Y) + ' ' +
+      //  IntToStr(TPlayer(Engine.Players[0]).Direction);
       StatusBar1.Panels[2].Text := FloatToStr(RoundTo(DrawDuration / OneMillisecond, -2));
-      StatusBar1.Panels[3].Text := IntToStr(TPlayer(Engine.Players[0]).Bullets.Count);
+      //StatusBar1.Panels[3].Text := IntToStr(TPlayer(Engine.Players[0]).Bullets.Count);
     finally
       Engine.Lock.Release;
@@ -111 +112 @@
   Randomize;
   DoubleBuffered := True;
+  Engine := TEngine.Create;
   Engine.Bitmap := Image1.Picture.Bitmap;
-  with Engine do begin
-    PlayerCount := 4;
-    with TPlayer(Players[0]) do begin
-      Name := 'Player 1';
-      Keys.Left := 65;
-      Keys.Down := 83;
-      Keys.Right := 68;
-      Keys.Up := 87;
-      Keys.Shoot := 69;
-    end;
-    with TPlayer(Players[1]) do begin
-      Name := 'Player 2';
-      Keys.Left := 37;
-      Keys.Down := 40;
-      Keys.Right := 39;
-      Keys.Up := 38;
-      Keys.Shoot := 17;
-    end;
-    with TPlayer(Players[2]) do begin
-      Name := 'Player 3';
-      Keys.Left := 76;
-      Keys.Down := 186;
-      Keys.Right := 222;
-      Keys.Up := 80;
-      Keys.Shoot := 191;
-    end;
-    with TPlayer(Players[3]) do begin
-      Name := 'Player 4';
-      Keys.Left := 100;
-      Keys.Down := 98;
-      Keys.Right := 102;
-      Keys.Up := 104;
-      Keys.Shoot := 105;
-    end;
-  end;
   Engine.NewGame;
   Engine.Active := True;
@@ -160 +127 @@
 begin
   PersistentForm.Free;
+  Engine.Free;
 end;