Changeset 23 for trunk/UCore.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/UCore.pas (modified) (18 diffs)

trunk/UCore.pas

@@ -8 +8 @@
   Dialogs, Classes, SysUtils, Contnrs, Graphics, SpecializedMatrix, SpecializedList,
   IntfGraphics, FPImage, LCLType, SpecializedBitmap, GraphType, Math, URectangle,
-  Syncobjs, UThreading;
+  Syncobjs, UThreading, Forms;
 
 const
@@ -173 +173 @@
     IntfImage: TLazIntfImage;
     ClearBackground: Boolean;
-    function GetPlayerCount: Integer;
     procedure SetActive(const AValue: Boolean);
     procedure SetBitmap(const AValue: TBitmap);
-    procedure SetPlayerCount(const AValue: Integer);
     procedure Redraw;
     function IsInsideHouses(Pos: TPoint): Boolean;
     procedure DoDrawToBitmap;
+    procedure InitPlayerPool;
   public
     Keyboard: TKeyboard;
     World: TWorld;
+    PlayerPool: TListObject; // TListObject<TPlayer>
     Players: TListObject; // TListObject<TPlayer>
     Lock: TCriticalSection;
@@ -189 +189 @@
     procedure ResizePlayerFrames;
     procedure Tick;
-    procedure Draw;
+    procedure Draw(Thread: TVirtualThread);
     procedure NewGame;
-    property PlayerCount: Integer read GetPlayerCount write SetPlayerCount;
     property Bitmap: TBitmap read FBitmap write SetBitmap;
     property Active: Boolean read FActive write SetActive;
@@ -213 +212 @@
 implementation
 
+resourcestring
+  SPlayer = 'Player';
+
+
 function SwapBRComponent(Value: Integer): Integer;
 begin
@@ -236 +239 @@
 begin
   repeat
-    Engine.Draw;
+    Engine.Draw(Self);
     Sleep(50);
   until Terminated;
@@ -589 +592 @@
 var
   I: Integer;
+  P: Integer;
   Pos: TPoint;
   D: Real;
@@ -660 +664 @@
           end;
         end else begin
-          if (ItemsXY[Pos.X, Pos.Y] = Byte(miPlayer1TankBody)) or
-          (ItemsXY[Pos.X, Pos.Y] = Byte(miPlayer1TankBody2)) then
-            with TPlayer(Engine.Players[0]) do begin
-              Shield := Shield - 1 / ShieldSteps;
-            end;
-          if (ItemsXY[Pos.X, Pos.Y] = Byte(miPlayer2Tankbody)) or
-          (ItemsXY[Pos.X, Pos.Y] = Byte(miPlayer2TankBody2)) then
-            with TPlayer(Engine.Players[1]) do begin
-              Shield := Shield - 1 / ShieldSteps;
-            end;
-          if (ItemsXY[Pos.X, Pos.Y] = Byte(miPlayer3TankBody)) or
-          (ItemsXY[Pos.X, Pos.Y] = Byte(miPlayer3TankBody2)) then
-            with TPlayer(Engine.Players[2]) do begin
-              Shield := Shield - 1 / ShieldSteps;
-            end;
-          if (ItemsXY[Pos.X, Pos.Y] = Byte(miPlayer4TankBody)) or
-          (ItemsXY[Pos.X, Pos.Y] = Byte(miPlayer4TankBody2)) then
-            with TPlayer(Engine.Players[3]) do begin
-              Shield := Shield - 1 / ShieldSteps;
-            end;
+          for P := 0 to Engine.Players.Count - 1 do
+          with TPlayer(Engine.Players[P]) do
+          if Enabled and (TMatter(Engine.World.Matter[ItemsXY[Pos.X, Pos.Y]]).Kind = mkTankBody) then
+            Shield := Shield - 1 / ShieldSteps;
           if StopByDirt then Explosion(LastPos, BulletExplosionRange);
           Bullets.Delete(I);
@@ -753 +741 @@
       not (((Y = 0) or (Y = (HouseSize - 1))) and (X > ((HouseSize - DoorSize) div 2)) and
       (X < ((HouseSize - 1 + DoorSize) div 2)))
-      then Matter := Byte(miPlayer1Cannon) + Id * 4
+      then Matter := Byte(miPlayer1Home) + Id * 4
         else Matter := Byte(miSpace);
       Engine.World.Surface.ItemsXY[House.Left + X,
@@ -965 +953 @@
 { TEngine }
 
-function TEngine.GetPlayerCount: Integer;
-begin
-  Result := Players.Count;
-end;
-
 procedure TEngine.SetActive(const AValue: Boolean);
 begin
@@ -986 +969 @@
     FSystemThread.Start;
   end else begin
+    FDrawThread.Terminate;
+    Application.ProcessMessages;
     FreeAndNil(FDrawThread);
     FreeAndNil(FSystemThread);
@@ -994 +979 @@
 begin
   FBitmap := AValue;
-  ResizePlayerFrames;
-end;
-
-procedure TEngine.SetPlayerCount(const AValue: Integer);
-var
-  NewPlayer: TPlayer;
-  I: Integer;
-begin
-  if Players.Count < AValue then begin
-    for I := Players.Count to AValue - 1 do begin
-      NewPlayer := TPlayer.Create;
-      NewPlayer.Engine := Self;
-      NewPlayer.Id := I;
-      NewPlayer.Name := 'Player ' + IntToStr(I);
-      NewPlayer.InitTanks;
-      Players.Add(NewPlayer);
-    end;
-  end else
-  if Players.Count > AValue then begin
-    for I := Players.Count - 1 downto AValue do
-      Players.Delete(I);
-  end;
   ResizePlayerFrames;
 end;
@@ -1125 +1088 @@
 end;
 
+procedure TEngine.InitPlayerPool;
+var
+  I: Integer;
+begin
+  PlayerPool.Clear;
+  with TPlayer(PlayerPool.AddNew(TPlayer.Create)) do begin
+    Keys.Left := 65;
+    Keys.Down := 83;
+    Keys.Right := 68;
+    Keys.Up := 87;
+    Keys.Shoot := 69;
+    Enabled := True;
+  end;
+  with TPlayer(PlayerPool.AddNew(TPlayer.Create)) do begin
+    Keys.Left := 37;
+    Keys.Down := 40;
+    Keys.Right := 39;
+    Keys.Up := 38;
+    Keys.Shoot := 17;
+    Enabled := True;
+  end;
+  with TPlayer(PlayerPool.AddNew(TPlayer.Create)) do begin
+    Keys.Left := 76;
+    Keys.Down := 186;
+    Keys.Right := 222;
+    Keys.Up := 80;
+    Keys.Shoot := 191;
+  end;
+  with TPlayer(PlayerPool.AddNew(TPlayer.Create)) do begin
+    Keys.Left := 100;
+    Keys.Down := 98;
+    Keys.Right := 102;
+    Keys.Up := 104;
+    Keys.Shoot := 105;
+  end;
+  for I := 0 to PlayerPool.Count - 1 do
+  with TPlayer(PlayerPool[I]) do begin
+    Engine := Self;
+    Id := I;
+    InitTanks;
+    Name := SPlayer + ' ' + IntToStr(I + 1);
+  end;
+end;
+
 procedure TEngine.ResizePlayerFrames;
 var
@@ -1159 +1166 @@
   FBitmapLock := TCriticalSection.Create;
   IntfImage := TLazIntfImage.Create(1, 1);
+  PlayerPool := TListObject.Create;
   Players := TListObject.Create;
+  Players.OwnsObjects := False;
   Keyboard := TKeyboard.Create;
   World := TWorld.Create;
   World.Engine := Self;
+  InitPlayerPool;
   Redraw;
 end;
@@ -1172 +1182 @@
   FBitmapLock.Free;
   IntfImage.Free;
+  PlayerPool.Free;
   Players.Free;
   Keyboard.Free;
@@ -1194 +1205 @@
 end;
 
-procedure TEngine.Draw;
+procedure TEngine.Draw(Thread: TVirtualThread);
 var
   I: Integer;
@@ -1210 +1221 @@
       Lock.Release;
     end;
-    Synchronize(DoDrawToBitmap);
+    if not Thread.Terminated then Thread.Synchronize(DoDrawToBitmap);
   end;
 end;
@@ -1219 +1230 @@
   I2: Integer;
 begin
+  Players.Clear;
+  for I := 0 to PlayerPool.Count - 1 do
+  with TPlayer(PlayerPool[I]) do
+  if Enabled then
+    Players.Add(PlayerPool[I]);
+  ResizePlayerFrames;
+
   World.Generate;
 
@@ -1227 +1245 @@
 end;
 
-initialization
-
-Engine := TEngine.Create;
-
-finalization
-
-Engine.Free;
-
 end.