Changeset 23 for trunk/Forms

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.

Location:

trunk/Forms

Files:

• UMainForm.lfm (modified) (3 diffs)
• UMainForm.pas (modified) (5 diffs)
• UNewGameForm.lfm (modified) (2 diffs)
• UNewGameForm.pas (modified) (3 diffs)

trunk/Forms/UMainForm.lfm

@@ -5 +5 @@
   Width = 514
   Caption = 'Tunneler'
-  ClientHeight = 389
+  ClientHeight = 385
   ClientWidth = 514
   Menu = MainMenu1
@@ -18 +18 @@
   object StatusBar1: TStatusBar
     Left = 0
-    Height = 17
-    Top = 372
+    Height = 21
+    Top = 364
     Width = 514
     Panels = <    
@@ -47 +47 @@
   object Image1: TImage
     Left = 0
-    Height = 372
+    Height = 364
     Top = 0
     Width = 514

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;
 

trunk/Forms/UNewGameForm.lfm

@@ -7 +7 @@
   ClientHeight = 387
   ClientWidth = 560
-  OnCreate = FormCreate
+  OnShow = FormShow
   LCLVersion = '0.9.31'
   object ButtonStart: TButton
@@ -32 +32 @@
   object Label1: TLabel
     Left = 8
-    Height = 14
+    Height = 18
     Top = 8
-    Width = 44
+    Width = 53
     Caption = 'Players:'
     ParentColor = False

trunk/Forms/UNewGameForm.pas

@@ -19 +19 @@
     ListView1: TListView;
     procedure ButtonStartClick(Sender: TObject);
-    procedure FormCreate(Sender: TObject);
+    procedure FormShow(Sender: TObject);
     procedure ListView1Change(Sender: TObject; Item: TListItem;
       Change: TItemChange);
@@ -40 +40 @@
 { TNewGameForm }
 
-procedure TNewGameForm.FormCreate(Sender: TObject);
-var
-  NewItem: TListItem;
-  I: Integer;
-begin
-  with ListView1 do try
-    BeginUpdate;
-    Clear;
-    for I := 0 to Engine.Players.Count - 1 do
-    with TPlayer(Engine.Players[I]) do begin
-      NewItem := Items.Add;
-      NewItem.Caption := Name;
-      NewItem.SubItems.Add(IntToStr(Color));
-      NewItem.SubItems.Add('');
-      NewItem.Checked := Enabled;
-      NewItem.Data := Pointer(Engine.Players[I]);
-    end;
-  finally
-    EndUpdate;
-  end;
-end;
-
 procedure TNewGameForm.ListView1Change(Sender: TObject; Item: TListItem;
   Change: TItemChange);
@@ -74 +52 @@
 end;
 
+procedure TNewGameForm.FormShow(Sender: TObject);
+var
+  NewItem: TListItem;
+  I: Integer;
+begin
+  with ListView1 do try
+    BeginUpdate;
+    Clear;
+    for I := 0 to Engine.PlayerPool.Count - 1 do
+    with TPlayer(Engine.PlayerPool[I]) do begin
+      NewItem := Items.Add;
+      NewItem.Caption := Name;
+      NewItem.SubItems.Add(IntToStr(Color));
+      NewItem.SubItems.Add('');
+      NewItem.Checked := Enabled;
+      NewItem.Data := Pointer(Engine.PlayerPool[I]);
+    end;
+  finally
+    EndUpdate;
+  end;
+end;
+
 end.