Changeset 57

Timestamp:

Dec 25, 2022, 9:29:43 AM (2 years ago)

Author:

chronos

Message:

• Modified: Start new round in delay after tank explosion.

Location:

trunk

Files:

• Forms/UFormMain.pas (modified) (2 diffs)
• UEngine.pas (modified) (14 diffs)
• tunneler.lpr (modified) (1 diff)

trunk/Forms/UFormMain.pas

@@ -191 +191 @@
 procedure TFormMain.AShowMapExecute(Sender: TObject);
 begin
-  if not Assigned(FormMap) then FormMap := TFormMap.Create(nil);
+  if not Assigned(FormMap) then FormMap := TFormMap.Create(Self);
   FormMap.Show;
 end;
@@ -225 +225 @@
 procedure TFormMain.FormKeyUp(Sender: TObject; var Key: Word; Shift: TShiftState
   );
+const
+  KeyF11 = 112;
+var
+  I: Integer;
 begin
   Engine.KeyBoard.KeyState[Key] := False;
+  {$IFDEF DEBUG}
+  if Key = KeyF11 then begin
+    // Destroy first alive player
+    for I := 0 to Engine.Players.Count - 1 do
+    with Engine.Players[I] do begin
+      if not Exploded then begin
+        Energy := -100;
+        Break;
+      end;
+    end;
+  end;
+  {$ENDIF}
 end;
 

trunk/UEngine.pas

@@ -6 +6 @@
   Dialogs, Classes, SysUtils, Graphics, SpecializedMatrix,
   IntfGraphics, FPImage, LCLType, SpecializedBitmap, GraphType, Math, URectangle,
-  Syncobjs, UThreading, Forms, DateUtils, UAudioSystem, XMLConf, DOM, fgl;
+  Syncobjs, UThreading, Forms, DateUtils, UAudioSystem, XMLConf, DOM,
+  Generics.Collections;
 
 const
@@ -27 +28 @@
   PlayerHouseSize = 30;
   PlayerHouseDoorSize = 8;
+  ExplosionDelay = 2;
 
 type
@@ -56 +58 @@
   end;
 
-  TBullets = class(TFPGObjectList<TBullet>)
+  TBullets = class(TObjectList<TBullet>)
   end;
 
@@ -71 +73 @@
   { TTanks }
 
-  TTanks = class(TFPGObjectList<TTank>)
+  TTanks = class(TObjectList<TTank>)
     procedure Assign(Source: TTanks);
   end;
@@ -102 +104 @@
     Dig: Boolean;
     LastPos: TPoint;
+    ExplosionPending: Boolean;
+    ExplosionTime: TDateTime;
     procedure SetExploded(const AValue: Boolean);
     function ShowTankProc(Item1, Item2: Byte): Byte;
@@ -149 +153 @@
   { TPlayers }
 
-  TPlayers = class(TFPGObjectList<TPlayer>)
+  TPlayers = class(TObjectList<TPlayer>)
     Engine: TEngine;
     function AddNew: TPlayer;
@@ -169 +173 @@
   { TMatters }
 
-  TMatters = class(TFPGObjectList<TMatter>)
+  TMatters = class(TObjectList<TMatter>)
     function AddNew: TMatter;
   end;
@@ -238 +242 @@
     PlayerPool: TPlayers;
     Players: TPlayers;
-    DigMasks: TFPGObjectList<TMatrixByte>;
+    DigMasks: TObjectList<TMatrixByte>;
     Lock: TCriticalSection;
     CurrentRound: Integer;
@@ -714 +718 @@
 begin
   // Check energy
-  if not Engine.IsInsideHouses(Position) then begin
-    Energy := Energy - 1 / EnergySteps;
+  if not ExplosionPending then begin
+    if not Engine.IsInsideHouses(Position) then begin
+      Energy := Energy - 1 / EnergySteps;
+    end else begin
+      if not Exploded then
+        Energy := Energy + 5 * 1 / EnergySteps;
+      if Energy > 1 then Energy := 1;
+    end;
     if Energy <= 0 then begin
       Energy := 0;
       Explosion(Position, ExplosionRange);
       Exploded := True;
+      ExplosionPending := True;
+      ExplosionTime := Now;
       Engine.AudioExplode.Play;
     end;
-  end else begin
-    if not Exploded then
-      Energy := Energy + 5 * 1 / EnergySteps;
-    if Energy > 1 then Energy := 1;
+  end;
+  if ExplosionPending and (SecondOf(Now - ExplosionTime) > ExplosionDelay) then begin
+    ExplosionPending := False;
+    Synchronize(Engine.CheckGameEnd);
   end;
   if LastEnergy <> Energy then begin
@@ -907 +919 @@
   Energy := 0;
   Shield := 0;
-  //Synchronize(Engine.CheckGameEnd);
 end;
 
@@ -936 +947 @@
       Round(World.Surface.Count.Y * 0.2) + Random(Round(World.Surface.Count.Y * 0.6)));
   Exploded := False;
+  ExplosionPending := False;
   Bullets.Clear;
   Energy := 1;
@@ -1540 +1552 @@
   AudioExplode.Open;
   InitPlayerPool;
-  DigMasks := TFPGObjectList<TMatrixByte>.Create;
+  DigMasks := TObjectList<TMatrixByte>.Create;
   InitDigMasks;
   Redraw;
@@ -1621 +1633 @@
   I: Integer;
 begin
-  Active := False;
   World.Generate;
 
@@ -1628 +1639 @@
   ClearBackground := True;
   Redraw;
-  Active := True;
 end;
 

trunk/tunneler.lpr

@@ -32 +32 @@
   Application.CreateForm(TCore, Core);
   Application.CreateForm(TFormMain, FormMain);
-  Application.CreateForm(TFormMap, FormMap);
   {$IFDEF DEBUG}
   {$ENDIF}