Changeset 103
- Timestamp:
- May 21, 2024, 3:55:43 PM (6 months ago)
- Files:
-
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
tags/1.1.1/Engine.pas
r98 r103 260 260 Lock: TCriticalSection; 261 261 CurrentRound: Integer; 262 Max Round: Integer;262 MaxScore: Integer; 263 263 AudioShot: TSound; 264 264 AudioExplode: TSound; … … 733 733 Explosion(Position, ExplosionRange); 734 734 Exploded := True; 735 ExplosionPending := True; 736 ExplosionTime := Now; 735 737 Engine.AudioExplode.Play; 736 738 end; … … 1883 1885 var 1884 1886 I: Integer; 1887 HighestScore: Integer; 1885 1888 begin 1886 1889 if Players.GetAliveCount <= 1 then begin 1890 HighestScore := 0; 1887 1891 for I := 0 to Players.Count - 1 do 1888 with Players[I] do 1892 with Players[I] do begin 1889 1893 if not Exploded then Inc(Score); 1890 if CurrentRound < MaxRound then begin 1894 HighestScore := Max(Score, HighestScore); 1895 end; 1896 if HighestScore < MaxScore then begin 1891 1897 Inc(CurrentRound); 1892 1898 NewRound; 1893 1899 State := gsNewRound; 1894 end else 1900 end else begin 1895 1901 State := gsMap; 1896 1902 if Assigned(FOnGameEnd) then 1897 1903 FOnGameEnd(Self); 1904 end; 1898 1905 end; 1899 1906 end; … … 2144 2151 InitDigMasks; 2145 2152 Redraw; 2146 Max Round := 5;2153 MaxScore := 3; 2147 2154 end; 2148 2155 -
tags/1.1.1/Forms/FormMain.pas
r101 r103 77 77 78 78 resourcestring 79 SRound = '%0:s of %1:s';79 SRound = '%0:s'; 80 80 81 81 { TFormMain } … … 95 95 // IntToStr(TPlayer(Engine.Players[0]).Direction); 96 96 StatusBar1.Panels[2].Text := FloatToStr(RoundTo(Engine.DrawDuration / OneMillisecond, -2)); 97 StatusBar1.Panels[3].Text := Format(SRound, [IntToStr(Engine.CurrentRound), 98 IntToStr(Engine.MaxRound)]); 97 StatusBar1.Panels[3].Text := Format(SRound, [IntToStr(Engine.CurrentRound)]); 99 98 finally 100 99 Engine.Lock.Release; -
tags/1.1.1/Languages/Tunneler.cs.po
r87 r103 213 213 #, object-pascal-format 214 214 msgctxt "formmain.sround" 215 msgid "%0:s of %1:s"216 msgstr "%0:s z %1:s"215 msgid "%0:s" 216 msgstr "%0:s" 217 217 218 218 #: sound.splaynotsupported -
tags/1.1.1/Languages/Tunneler.pot
r87 r103 203 203 #, object-pascal-format 204 204 msgctxt "formmain.sround" 205 msgid "%0:s of %1:s"205 msgid "%0:s" 206 206 msgstr "" 207 207 -
trunk/Engine.pas
r98 r103 260 260 Lock: TCriticalSection; 261 261 CurrentRound: Integer; 262 Max Round: Integer;262 MaxScore: Integer; 263 263 AudioShot: TSound; 264 264 AudioExplode: TSound; … … 733 733 Explosion(Position, ExplosionRange); 734 734 Exploded := True; 735 ExplosionPending := True; 736 ExplosionTime := Now; 735 737 Engine.AudioExplode.Play; 736 738 end; … … 1883 1885 var 1884 1886 I: Integer; 1887 HighestScore: Integer; 1885 1888 begin 1886 1889 if Players.GetAliveCount <= 1 then begin 1890 HighestScore := 0; 1887 1891 for I := 0 to Players.Count - 1 do 1888 with Players[I] do 1892 with Players[I] do begin 1889 1893 if not Exploded then Inc(Score); 1890 if CurrentRound < MaxRound then begin 1894 HighestScore := Max(Score, HighestScore); 1895 end; 1896 if HighestScore < MaxScore then begin 1891 1897 Inc(CurrentRound); 1892 1898 NewRound; 1893 1899 State := gsNewRound; 1894 end else 1900 end else begin 1895 1901 State := gsMap; 1896 1902 if Assigned(FOnGameEnd) then 1897 1903 FOnGameEnd(Self); 1904 end; 1898 1905 end; 1899 1906 end; … … 2144 2151 InitDigMasks; 2145 2152 Redraw; 2146 Max Round := 5;2153 MaxScore := 3; 2147 2154 end; 2148 2155 -
trunk/Forms/FormMain.pas
r101 r103 77 77 78 78 resourcestring 79 SRound = '%0:s of %1:s';79 SRound = '%0:s'; 80 80 81 81 { TFormMain } … … 95 95 // IntToStr(TPlayer(Engine.Players[0]).Direction); 96 96 StatusBar1.Panels[2].Text := FloatToStr(RoundTo(Engine.DrawDuration / OneMillisecond, -2)); 97 StatusBar1.Panels[3].Text := Format(SRound, [IntToStr(Engine.CurrentRound), 98 IntToStr(Engine.MaxRound)]); 97 StatusBar1.Panels[3].Text := Format(SRound, [IntToStr(Engine.CurrentRound)]); 99 98 finally 100 99 Engine.Lock.Release; -
trunk/Languages/Tunneler.cs.po
r87 r103 213 213 #, object-pascal-format 214 214 msgctxt "formmain.sround" 215 msgid "%0:s of %1:s"216 msgstr "%0:s z %1:s"215 msgid "%0:s" 216 msgstr "%0:s" 217 217 218 218 #: sound.splaynotsupported -
trunk/Languages/Tunneler.pot
r87 r103 203 203 #, object-pascal-format 204 204 msgctxt "formmain.sround" 205 msgid "%0:s of %1:s"205 msgid "%0:s" 206 206 msgstr "" 207 207
Note:
See TracChangeset
for help on using the changeset viewer.