Changeset 103 for trunk

Timestamp:

May 21, 2024, 3:55:43 PM (7 months ago)

Author:

chronos

Message:

• Fixed: Destroying other player didn't end the round.
• Modified: End the game after three wins of the best player.

Location:

trunk

Files:

• Engine.pas (modified) (4 diffs)
• Forms/FormMain.pas (modified) (2 diffs)
• Languages/Tunneler.cs.po (modified) (1 diff)
• Languages/Tunneler.pot (modified) (1 diff)

trunk/Engine.pas

@@ -260 +260 @@
     Lock: TCriticalSection;
     CurrentRound: Integer;
-    MaxRound: Integer;
+    MaxScore: Integer;
     AudioShot: TSound;
     AudioExplode: TSound;
@@ -733 +733 @@
     Explosion(Position, ExplosionRange);
     Exploded := True;
+    ExplosionPending := True;
+    ExplosionTime := Now;
     Engine.AudioExplode.Play;
   end;
@@ -1883 +1885 @@
 var
   I: Integer;
+  HighestScore: Integer;
 begin
   if Players.GetAliveCount <= 1 then begin
+    HighestScore := 0;
     for I := 0 to Players.Count - 1 do
-    with Players[I] do
+    with Players[I] do begin
       if not Exploded then Inc(Score);
-    if CurrentRound < MaxRound then begin
+      HighestScore := Max(Score, HighestScore);
+    end;
+    if HighestScore < MaxScore then begin
       Inc(CurrentRound);
       NewRound;
       State := gsNewRound;
-    end else
+    end else begin
       State := gsMap;
       if Assigned(FOnGameEnd) then
         FOnGameEnd(Self);
+    end;
   end;
 end;
@@ -2144 +2151 @@
   InitDigMasks;
   Redraw;
-  MaxRound := 5;
+  MaxScore := 3;
 end;
 

trunk/Forms/FormMain.pas

@@ -77 +77 @@
 
 resourcestring
-  SRound = '%0:s of %1:s';
+  SRound = '%0:s';
 
 { TFormMain }
@@ -95 +95 @@
         //  IntToStr(TPlayer(Engine.Players[0]).Direction);
         StatusBar1.Panels[2].Text := FloatToStr(RoundTo(Engine.DrawDuration / OneMillisecond, -2));
-        StatusBar1.Panels[3].Text := Format(SRound, [IntToStr(Engine.CurrentRound),
-          IntToStr(Engine.MaxRound)]);
+        StatusBar1.Panels[3].Text := Format(SRound, [IntToStr(Engine.CurrentRound)]);
       finally
         Engine.Lock.Release;

trunk/Languages/Tunneler.cs.po

@@ -213 +213 @@
 #, object-pascal-format
 msgctxt "formmain.sround"
-msgid "%0:s of %1:s"
-msgstr "%0:s z %1:s"
+msgid "%0:s"
+msgstr "%0:s"
 
 #: sound.splaynotsupported

trunk/Languages/Tunneler.pot

@@ -203 +203 @@
 #, object-pascal-format
 msgctxt "formmain.sround"
-msgid "%0:s of %1:s"
+msgid "%0:s"
 msgstr ""