Changeset 61 for trunk/UEngine.pas

Timestamp:

Dec 25, 2022, 10:44:53 PM (23 months ago)

Author:

chronos

Message:

• Fixed: Do not regenerate world on new round. Correctly reset players tanks position and state.
• Added: Main menu statistics half screen section.

File:

• trunk/UEngine.pas (modified) (40 diffs)

trunk/UEngine.pas

@@ -7 +7 @@
   IntfGraphics, FPImage, LCLType, SpecializedBitmap, GraphType, Math, URectangle,
   Syncobjs, UThreading, Forms, DateUtils, UAudioSystem, XMLConf, DOM,
-  Generics.Collections;
+  Generics.Collections, UWorld, UMatter;
 
 const
@@ -32 +32 @@
   clTuna = $5555ff;
   clPurple = $aa00aa;
+  clOrange = $0055aa;
   clDarkOrange = $0000aa;
   clDarkGreen = $00aa00;
+  clCyan = $ffff00;
 
 type
@@ -81 +83 @@
     procedure Assign(Source: TTanks);
   end;
-
-  TMatterIndex = (miSpace, miDirt1, miDirt2, miRock, miBullet1, miBullet2, miBorder,
-    miPlayer1Cannon, miPlayer1Home, miPlayer1TankBody, miPlayer1TankBody2,
-    miPlayer2Cannon, miPlayer2Home, miPlayer2TankBody, miPlayer2TankBody2,
-    miPlayer3Cannon, miPlayer3Home, miPlayer3TankBody, miPlayer3TankBody2,
-    miPlayer4Cannon, miPlayer4Home, miPlayer4TankBody, miPlayer4TankBody2,
-    miPlayer5Cannon, miPlayer5Home, miPlayer5TankBody, miPlayer5TankBody2,
-    miPlayer6Cannon, miPlayer6Home, miPlayer6TankBody, miPlayer6TankBody2,
-    miPlayer7Cannon, miPlayer7Home, miPlayer7TankBody, miPlayer7TankBody2,
-    miPlayer8Cannon, miPlayer8Home, miPlayer8TankBody, miPlayer8TankBody2);
-
-  TMatterKind = (mkSpace, mkDirt, mkRock, mkBullet, mkTankBody,
-    mkHome, mkBorder);
 
   TColisionState = record
@@ -116 +105 @@
     function DigProc(Item1, Item2: Byte): Byte;
   public
+    Name: string;
     Color1: TColor;
     Color2: TColor;
@@ -122 +112 @@
     Engine: TEngine;
     Position: TPoint;
+    StartPosition: TPoint;
     Score: Integer;
     Direction: Integer;
     ScreenFrame: TRectangle;
-    Name: string;
     Keys: TPlayerKeys;
     Tanks: TTanks;
@@ -137 +127 @@
     LastShield: Real;
     House: TRectangle;
+    ShootCount: Integer;
+    procedure ResetTank;
     procedure Init;
     procedure Explosion(Position: TPoint; Distance: Integer);
@@ -165 +157 @@
     procedure SaveConfig(Config: TXMLConfig; Path: string);
     function GetAliveCount: Integer;
-  end;
-
-  { TMatter }
-
-  TMatter = class
-    Kind: TMatterKind;
-    Player: Integer;
-    Color: TColor;
-    Diggable: Boolean;
-    Blocking: Boolean;
-  end;
-
-  { TMatters }
-
-  TMatters = class(TObjectList<TMatter>)
-    function AddNew: TMatter;
-  end;
-
-  { TWorld }
-
-  TWorld = class
-  private
-    function GetSize: TMatrixByteIndex;
-    procedure SetSize(const AValue: TMatrixByteIndex);
-    procedure InitMatter;
-  public
-    Engine: TEngine;
-    Surface: TMatrixByte;
-    Matters: TMatters;
-    procedure Generate;
-    constructor Create;
-    destructor Destroy; override;
-    procedure DrawToBitmap(Bitmap: TBitmap);
-    property Size: TMatrixByteIndex read GetSize write SetSize;
+    function GetWinner: TPlayer;
   end;
 
@@ -243 +202 @@
     FState: TGameState;
     FSystemThread: TSystemThread;
-    ClearBackground: Boolean;
+    FClearBackground: Boolean;
     FStateTime: TDateTime;
+    FShowMenuStats: Boolean;
     procedure InitDigMasks;
     procedure SetActive(const AValue: Boolean);
@@ -254 +214 @@
     procedure CheckGameEnd;
     procedure DrawMenu;
+    procedure DrawStats;
     procedure DrawGamePrepare(Thread: TVirtualThread);
     procedure DrawGame;
@@ -262 +223 @@
     procedure SetState(AValue: TGameState);
   public
+    ThreadErrorMessage: string;
     Keyboard: TKeyboard;
     World: TWorld;
@@ -291 +253 @@
   end;
 
-  TFastBitmapPixelComponents = packed record
-    B, G, R, A: Byte;
-  end;
-
 const
   DirectionToDelta: array[0..7] of TPoint =
@@ -300 +258 @@
     (X: 0; Y: 1), (X: -1; Y: 1), (X: -1; Y: 0), (X: -1; Y: -1));
 
-function SwapBRComponent(Value: Cardinal): Cardinal; inline;
-
 
 implementation
 
 uses
-  UPlatform;
+  UPlatform, UFastPixel;
 
 resourcestring
@@ -312 +268 @@
   SRound = 'Round';
   SPressEsc = 'Press ESC to continue';
-  SStartGame = 'start game';
-  SInstructions = 'instructions';
-  SInformation = 'information';
-  SWorldReady = 'world ready';
-  SExit = 'exit';
-
-function SwapBRComponent(Value: Cardinal): Cardinal; inline;
-begin
-//  Result := (Value and $00ff00) or ((Value shr 16) and $ff) or ((Value and $ff) shl 16);
-  Result := Value;
-  TFastBitmapPixelComponents(Result).R := TFastBitmapPixelComponents(Value).B;
-  TFastBitmapPixelComponents(Result).B := TFastBitmapPixelComponents(Value).R;
-end;
-
-{ TMatters }
-
-function TMatters.AddNew: TMatter;
-begin
-  Result := TMatter.Create;
-  Add(Result);
-end;
+  SStartGame = 'Start game';
+  SInstructions = 'Instructions';
+  SInformation = 'Information';
+  SWorldReady = 'World ready';
+  SExit = 'Exit';
+  SStatistics = 'Statistics';
+  SShotsFired = 'Shot fired';
+  SWinnerIs = 'The winner is';
 
 { TTanks }
@@ -383 +326 @@
   with Items[I] do
     if not Exploded then Inc(Result);
+end;
+
+function TPlayers.GetWinner: TPlayer;
+var
+  I: Integer;
+  TopScore: Integer;
+begin
+  Result := nil;
+  TopScore := 0;
+  for I := 0 to Count - 1 do
+  with Items[I] do
+  if Enabled and (Score > TopScore) then begin
+    TopScore := Score;
+    Result := Items[I];
+  end;
 end;
 
@@ -404 +362 @@
 procedure TSystemThread.Execute;
 begin
-  repeat
-    Engine.Tick;
-    Sleep(10);
-  until Terminated;
+  try
+    repeat
+      Engine.Tick;
+      Sleep(10);
+    until Terminated;
+  except
+    on E: Exception do
+      Engine.ThreadErrorMessage := E.Message;
+  end;
 end;
 
@@ -429 +392 @@
 procedure TDrawThread.Execute;
 begin
-  repeat
-    Engine.DrawThread(Self);
-    if not Terminated then Synchronize(DrawSync);
-    Sleep(50);
-  until Terminated;
+  try
+    repeat
+      Engine.DrawThread(Self);
+      if not Terminated then Synchronize(DrawSync);
+      Sleep(50);
+    until Terminated;
+  except
+    on E: Exception do
+      Engine.ThreadErrorMessage := E.Message;
+  end;
 end;
 
@@ -473 +441 @@
   FreeAndNil(Image);
   inherited;
-end;
-
-{ TWorld }
-
-function TWorld.GetSize: TMatrixByteIndex;
-begin
-  Result := Surface.Count;
-end;
-
-procedure TWorld.SetSize(const AValue: TMatrixByteIndex);
-begin
-  Surface.Count := AValue;
-  Generate;
-end;
-
-procedure TWorld.InitMatter;
-var
-  I: Integer;
-begin
-  // Space
-  with Matters.AddNew do begin
-    Kind := mkSpace;
-    Color := clBlack;
-    Player := -1;
-  end;
-  // Dirt1
-  with Matters.AddNew do begin
-    Kind := mkDirt;
-    Color := $0756b0;
-    Player := -1;
-    Diggable := True;
-  end;
-  // Dirt2
-  with Matters.AddNew do begin
-    Kind := mkDirt;
-    Color := $2170c3;
-    Player := -1;
-    Diggable := True;
-  end;
-  // Rock
-  with Matters.AddNew do begin
-    Kind := mkRock;
-    Color := TColor($9a9a9a);
-    Player := -1;
-    Blocking := True;
-  end;
-  // Bullet1
-  with Matters.AddNew do begin
-    Kind := mkBullet;
-    Color := clRed;
-    Player := -1;
-  end;
-  // Bullet2
-  with Matters.AddNew do begin
-    Kind := mkBullet;
-    Color := clRed;
-    Player := -1;
-  end;
-  // Border
-  with Matters.AddNew do begin
-    Kind := mkBorder;
-    Color := clNavy;
-    Player := -1;
-  end;
-
-  for I := 0 to 7 do begin
-    // Player cannon
-    with Matters.AddNew do begin
-      Kind := mkTankBody;
-      Player := I;
-      Blocking := True;
-    end;
-    // Player home
-    with Matters.AddNew do begin
-      Kind := mkHome;
-      Player := I;
-      Blocking := True;
-    end;
-    // Player body1
-    with Matters.AddNew do begin
-      Kind := mkTankBody;
-      Player := I;
-      Blocking := True;
-    end;
-    // Player body2
-    with Matters.AddNew do begin
-      Kind := mkTankBody;
-      Player := I;
-      Blocking := True;
-    end;
-  end;
-end;
-
-procedure TWorld.Generate;
-var
-  X, Y: Integer;
-  Distance: Double;
-  Delta: Double;
-begin
-  for Y := 0 to Surface.Count.Y - 1 do
-    for X := 0 to Surface.Count.X - 1 do begin
-      if Random < 0.5 then
-        Surface.ItemsXY[X, Y] := Byte(miDirt1) else
-        Surface.ItemsXY[X, Y] := Byte(miDirt2);
-    end;
-
-  Distance := 0.1 * Surface.Count.X;
-  Delta := 0;
-  for Y := 0 to Surface.Count.Y - 1 do begin
-    for X := 0 to Round(Distance) - 1 do begin
-      Surface.ItemsXY[X, Y] := Byte(miRock);
-    end;
-    Delta := (Random * 2 - 1) * 3 - (Distance / (0.1 * Surface.Count.X) * 2 - 1);
-    Distance := Distance + Delta;
-  end;
-
-  Distance := 0.1 * Surface.Count.X;
-  Delta := 0;
-  for Y := 0 to Surface.Count.Y - 1 do begin
-    for X := 0 to Round(Distance) - 1 do begin
-      Surface.ItemsXY[Surface.Count.X - 1 - X, Y] := Byte(miRock);
-    end;
-    Delta := (Random * 2 - 1) * 3 - (Distance / (0.1 * Surface.Count.X) * 2 - 1);
-    Distance := Distance + Delta;
-  end;
-
-  Distance := 0.1 * Surface.Count.Y;
-  Delta := 0;
-  for X := 0 to Surface.Count.X - 1 do begin
-    for Y := 0 to Round(Distance) - 1 do begin
-      Surface.ItemsXY[X, Y] := Byte(miRock);
-    end;
-    Delta := (Random * 2 - 1) * 3 - (Distance / (0.1 * Surface.Count.Y) * 2 - 1);
-    Distance := Distance + Delta;
-  end;
-
-  Distance := 0.1 * Surface.Count.Y;
-  Delta := 0;
-  for X := 0 to Surface.Count.X - 1 do begin
-    for Y := 0 to Round(Distance) - 1 do begin
-      Surface.ItemsXY[X, Surface.Count.Y - 1 - Y] := Byte(miRock);
-    end;
-    Delta := (Random * 2 - 1) * 3 - (Distance / (0.1 * Surface.Count.Y) * 2 - 1);
-    Distance := Distance + Delta;
-  end;
-end;
-
-constructor TWorld.Create;
-var
-  NewSize: TMatrixByteIndex;
-begin
-  Matters := TMatters.Create;
-  InitMatter;
-  Surface := TMatrixByte.Create;
-  NewSize.X := 800;
-  NewSize.Y := 300;
-  Size := NewSize;
-end;
-
-destructor TWorld.Destroy;
-begin
-  FreeAndNil(Surface);
-  FreeAndNil(Matters);
-  inherited;
-end;
-
-procedure TWorld.DrawToBitmap(Bitmap: TBitmap);
-var
-  X, Y: Integer;
-  PixelPtr: PInteger;
-  PixelRowPtr: PInteger;
-  RawImage: TRawImage;
-  BytePerPixel: Integer;
-  P: Integer;
-begin
-  Bitmap.BeginUpdate;
-  try
-    RawImage := Bitmap.RawImage;
-    PixelRowPtr := PInteger(RawImage.Data);
-    BytePerPixel := RawImage.Description.BitsPerPixel div 8;
-    for Y := 0 to Bitmap.Height - 1 do begin
-      PixelPtr := PixelRowPtr;
-      for X := 0 to Bitmap.Width - 1 do begin
-        P := Matters[Surface.ItemsXY[Trunc(X / Bitmap.Width * Surface.Count.X),
-            Trunc(Y / Bitmap.Height * Surface.Count.Y)]].Color;
-        PixelPtr^ := SwapBRComponent(P);
-        Inc(PByte(PixelPtr), BytePerPixel);
-      end;
-      Inc(PByte(PixelRowPtr), RawImage.Description.BytesPerLine);
-    end;
-  finally
-    Bitmap.EndUpdate;
-  end;
 end;
 
@@ -712 +487 @@
     if (Bullets.Count < MaxBulletCount) and
     ((Now - LastShootTime) > ShootDelay * OneSecond) then begin
+      Inc(ShootCount);
       NewBullet := TBullet.Create;
       NewBullet.Player := Self;
@@ -797 +573 @@
   if ExplosionPending and (SecondOf(Now - ExplosionTime) > ExplosionDelay) then begin
     ExplosionPending := False;
-    Synchronize(Engine.CheckGameEnd);
+    Engine.CheckGameEnd;
   end;
   if LastEnergy <> Energy then begin
@@ -882 +658 @@
   end;
 
-  if not Exploded then ShowTank;
+  if (Engine.State = gsGame) and not Exploded then ShowTank;
 end;
 
@@ -973 +749 @@
   if FExploded = AValue then Exit;
   FExploded := AValue;
-  if FExploded then HideTank else ShowTank;
-  Energy := 0;
-  Shield := 0;
+  if FExploded then begin
+    HideTank;
+    Energy := 0;
+    Shield := 0;
+  end else ShowTank;
 end;
 
@@ -981 +759 @@
 begin
   with Engine.World do begin
-    Surface.Merge(Surface.CreateIndex(Position.X - TTank(Tanks[Direction]).Image.Count.X div 2,
-      Position.Y - TTank(Tanks[Direction]).Image.Count.Y div 2),
-      TTank(Tanks[Direction]).Image, ShowTankProc);
+    Surface.Merge(Surface.CreateIndex(
+      Position.X - Tanks[Direction].Image.Count.X div 2,
+      Position.Y - Tanks[Direction].Image.Count.Y div 2),
+      Tanks[Direction].Image, ShowTankProc);
   end;
 end;
@@ -998 +777 @@
 end;
 
-procedure TPlayer.Init;
-begin
-  with Engine do
-    Position := Point(Round(World.Surface.Count.X * 0.2) + Random(Round(World.Surface.Count.X * 0.6)),
-      Round(World.Surface.Count.Y * 0.2) + Random(Round(World.Surface.Count.Y * 0.6)));
-  Exploded := False;
+procedure TPlayer.ResetTank;
+begin
+  HideTank;
+  Position := StartPosition;
   ExplosionPending := False;
   Bullets.Clear;
@@ -1009 +786 @@
   Shield := 1;
   Direction := 0;
+  ShootCount := 0;
+  ShowTank;
+  Exploded := False;
+end;
+
+procedure TPlayer.Init;
+begin
+  with Engine do
+    StartPosition := Point(Round(World.Surface.Count.X * 0.2) + Random(Round(World.Surface.Count.X * 0.6)),
+      Round(World.Surface.Count.Y * 0.2) + Random(Round(World.Surface.Count.Y * 0.6)));
+  Position := StartPosition;
   PlaceHouse;
-  ShowTank;
 end;
 
@@ -1039 +826 @@
 begin
   with Engine.World do begin
-    Surface.Merge(Surface.CreateIndex(Position.X - TTank(Tanks[Direction]).Image.Count.X div 2,
-      Position.Y - TTank(Tanks[Direction]).Image.Count.Y div 2), TTank(Tanks[Direction]).Image, HideTankProc);
+    Surface.Merge(Surface.CreateIndex(
+      Position.X - Tanks[Direction].Image.Count.X div 2,
+      Position.Y - Tanks[Direction].Image.Count.Y div 2),
+      Tanks[Direction].Image, HideTankProc);
   end;
 end;
@@ -1161 +950 @@
   Enabled := Source.Enabled;
   Position := Source.Position;
+  StartPosition := Source.StartPosition;
   Score := Source.Score;
+  ShootCount := Source.ShootCount;
+  FExploded := Source.FExploded;
   Tanks.Assign(Source.Tanks);
 end;
@@ -1275 +1067 @@
   BytePerPixel := RawImage.Description.BitsPerPixel div 8;
   BytePerRow := RawImage.Description.BytesPerLine;
-  if ClearBackground then begin
+  if FClearBackground then begin
     BgColor := World.Matters[Integer(miBorder)].Color;
     BgColor := SwapBRComponent(BgColor);
     FillDWord(RawImage.Data^, Bitmap.Height * BytePerRow div 4, BgColor);
-    ClearBackground := False;
+    FClearBackground := False;
   end;
 
@@ -1338 +1130 @@
 
 procedure TEngine.DrawInformation;
+var
+  Text: string;
+  X: Integer;
 begin
   with Bitmap.Canvas do begin
-
+    Brush.Style := bsSolid;
+    Brush.Color := clBlack;
+    Clear;
+
+    X := Bitmap.Width div 2;
+
+    Brush.Style := bsClear;
+    Pen.Style := psSolid;
+    Pen.Color := clWhite;
+    Font.Color := clTuna;
+    Font.Size := 30;
+    Text := SInformation;
+    TextOut(X - TextWidth(Text) div 2, Bitmap.Height div 10, Text);
+
+    Font.Color := clGreen;
+    Font.Size := 30;
+    Text := SPressEsc;
+    TextOut(X - TextWidth(Text) div 2, Bitmap.Height div 10 * 9, Text);
   end;
 end;
 
 procedure TEngine.DrawInstructions;
-begin
-
+var
+  Text: string;
+  X: Integer;
+begin
+  with Bitmap.Canvas do begin
+    Brush.Style := bsSolid;
+    Brush.Color := clBlack;
+    Clear;
+
+    X := Bitmap.Width div 2;
+
+    Brush.Style := bsClear;
+    Pen.Style := psSolid;
+    Pen.Color := clWhite;
+    Font.Color := clTuna;
+    Font.Size := 30;
+    Text := SInstructions;
+    TextOut(X - TextWidth(Text) div 2, Bitmap.Height div 10, Text);
+
+    Font.Color := clGreen;
+    Font.Size := 30;
+    Text := SPressEsc;
+    TextOut(X - TextWidth(Text) div 2, Bitmap.Height div 10 * 9, Text);
+  end;
 end;
 
@@ -1630 +1464 @@
 var
   Text: string;
+  MenuWidth: Integer;
 begin
   with Bitmap.Canvas do begin
@@ -1635 +1470 @@
     Brush.Color := clBlack;
     Clear;
+
+    if FShowMenuStats then begin
+      MenuWidth := Bitmap.Width div 2;
+      DrawStats;
+    end else MenuWidth := Bitmap.Width;
 
     Brush.Style := bsClear;
@@ -1642 +1482 @@
     Font.Size := 30;
     Text := 'TUNNELER';
-    TextOut((Bitmap.Width - TextWidth(Text)) div 2, Bitmap.Height div 10, Text);
+    TextOut((MenuWidth - TextWidth(Text)) div 2, Bitmap.Height div 10, Text);
 
     Font.Color := clDarkOrange;
     Font.Size := 20;
     Text := 'by Chronosoft';
-    TextOut((Bitmap.Width - TextWidth(Text)) div 2, Bitmap.Height div 10 + 60, Text);
+    TextOut((MenuWidth - TextWidth(Text)) div 2, Bitmap.Height div 10 + 70, Text);
 
     Pen.Color := clPurple;
     Pen.Width := 6;
-    Frame((Bitmap.Width - 400) div 2, Bitmap.Height div 10 * 4 - 40,
-      (Bitmap.Width + 400) div 2, Bitmap.Height div 10 * 4 + 200);
+    Frame((MenuWidth - 400) div 2, Bitmap.Height div 10 * 4 - 40,
+      (MenuWidth + 400) div 2, Bitmap.Height div 10 * 4 + 200);
 
     Font.Color := clPurple;
     Font.Size := 20;
     Text := '<F1>  ' + SStartGame;
-    TextOut((Bitmap.Width - TextWidth(Text)) div 2, Bitmap.Height div 10 * 4, Text);
+    TextOut((MenuWidth - TextWidth(Text)) div 2, Bitmap.Height div 10 * 4, Text);
     Text := '<F2>  ' + SInstructions;
-    TextOut((Bitmap.Width - TextWidth(Text)) div 2, Bitmap.Height div 10 * 4 + 40, Text);
+    TextOut((MenuWidth - TextWidth(Text)) div 2, Bitmap.Height div 10 * 4 + 40, Text);
     Text := '<F3>  ' + SInformation;
-    TextOut((Bitmap.Width - TextWidth(Text)) div 2, Bitmap.Height div 10 * 4 + 80, Text);
-    Text := '<F10>  ' + SExit;
-    TextOut((Bitmap.Width - TextWidth(Text)) div 2, Bitmap.Height div 10 * 4 + 120, Text);
+    TextOut((MenuWidth - TextWidth(Text)) div 2, Bitmap.Height div 10 * 4 + 80, Text);
+    Text := '<Alt+F4>  ' + SExit;
+    TextOut((MenuWidth - TextWidth(Text)) div 2, Bitmap.Height div 10 * 4 + 120, Text);
 
     Font.Color := clDarkGreen;
     Font.Size := 20;
     Text := '(' + SWorldReady + ')';
-    TextOut((Bitmap.Width - TextWidth(Text)) div 2, Bitmap.Height div 10 * 9, Text);
+    TextOut((MenuWidth - TextWidth(Text)) div 2, Bitmap.Height div 10 * 9, Text);
+  end;
+end;
+
+procedure TEngine.DrawStats;
+var
+  X: Integer;
+  Text: string;
+  Winner: TPlayer;
+begin
+  with Bitmap.Canvas do begin
+    X := Bitmap.Width div 4 * 3;
+
+    Brush.Style := bsClear;
+    Pen.Style := psSolid;
+
+    Pen.Color := clWhite;
+    MoveTo(Bitmap.Width div 2, 0);
+    LineTo(Bitmap.Width div 2, Bitmap.Height);
+
+    Font.Color := clCyan;
+    Font.Size := 20;
+    Text := SStatistics;
+    TextOut(X - TextWidth(Text) div 2, Bitmap.Height div 10, Text);
+
+    Font.Color := clOrange;
+    Font.Size := 20;
+
+    //Text := SShotsFired + ' ' + IntToStr(ShootCount);
+    //TextOut(X - TextWidth(Text) div 2, Bitmap.Height div 10, Text);
+
+    Winner := Players.GetWinner;
+    if Assigned(Winner) then begin
+      Text := SWinnerIs + ' ' + Winner.Name;
+      TextOut(X - TextWidth(Text) div 2, Bitmap.Height div 10 + 60, Text);
+    end;
   end;
 end;
@@ -1684 +1559 @@
     FBitmapLower.Count := OldCount;
 
-    if ClearBackground then FBitmapLower.FillAll(clNavy);
+    if FClearBackground then FBitmapLower.FillAll(clNavy);
     for I := 0 to Players.Count - 1 do
     if Players[I].Enabled then begin
@@ -1719 +1594 @@
     end;
   end;
-  ClearBackground := True;
+  FClearBackground := True;
   Redraw;
 end;
@@ -1735 +1610 @@
   Keyboard := TKeyboard.Create;
   World := TWorld.Create;
-  World.Engine := Self;
   //DefaultAudioSystem := TAudioSystemMPlayer.Create(nil);
   AudioShot := TMediaPlayer.Create(nil);
@@ -1747 +1621 @@
   InitDigMasks;
   Redraw;
-  MaxRound := 3;
+  MaxRound := 5;
 end;
 
@@ -1814 +1688 @@
 
 procedure TEngine.NewGame;
+var
+  I: Integer;
 begin
   Active := False;
@@ -1819 +1695 @@
   ResizePlayerFrames;
   CurrentRound := 1;
-  NewRound;
-
-  Active := True;
-end;
-
-procedure TEngine.NewRound;
-var
-  I: Integer;
-begin
   World.Generate;
-
   for I := 0 to Players.Count - 1 do
     Players[I].Init;
-  ClearBackground := True;
+  NewRound;
+
+  Active := True;
+end;
+
+procedure TEngine.NewRound;
+var
+  I: Integer;
+begin
+  for I := 0 to Players.Count - 1 do
+    Players[I].ResetTank;
+  FClearBackground := True;
   Redraw;
 end;
@@ -1866 +1743 @@
     if Key = KeyF2 then begin
       State := gsInstructions;
-      NewGame;
     end else
     if Key = KeyF3 then begin
       State := gsInformation;
-      NewGame;
     end;
   end else
@@ -1876 +1751 @@
     if Key = KeyEsc then begin
       State := gsMenu;
+      FShowMenuStats := True;
+    end;
+  end else
+  if State in [gsInformation, gsInstructions] then begin
+    if Key = KeyEsc then begin
+      State := gsMenu;
     end;
   end;
 
   {$IFDEF DEBUG}
-  if Key = KeyF4 then begin
+  if (State = gsGame) and (Key = KeyF4) then begin
     // Destroy first alive player
     for I := 0 to Players.Count - 1 do
@@ -1890 +1771 @@
     end;
   end else
-  if Key = KeyF5 then begin
+  if (State = gsGame) and (Key = KeyF5) then begin
     State := gsMap;
   end;