X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_game.pas;h=256a564513e88b9c3b08e82e3a2b26209cee7296;hb=db664c0202c77b9f402ea050bd4776f349d6ee4a;hp=e79845b5c88d12ebf3323269822cc25dacf81065;hpb=847038a14751d192fcc4af172d7a963e28144c72;p=d2df-sdl.git diff --git a/src/game/g_game.pas b/src/game/g_game.pas index e79845b..256a564 100644 --- a/src/game/g_game.pas +++ b/src/game/g_game.pas @@ -1906,6 +1906,7 @@ begin // Çàêîí÷èëñÿ óðîâåíü â Ñâîåé èãðå: if gGameSettings.GameType in [GT_CUSTOM, GT_SERVER, GT_CLIENT] then begin + gState := STATE_INTERCUSTOM; InterReadyTime := -1; if gLastMap and (gGameSettings.GameMode = GM_COOP) then begin @@ -1915,9 +1916,7 @@ begin end else gMusic.SetByName('MUSIC_ROUNDMUS'); - gMusic.Play(); - gState := STATE_INTERCUSTOM; e_UnpressAllKeys(); end else // Çàêîí÷èëàñü ïîñëåäíÿÿ êàðòà â Îäèíî÷íîé èãðå @@ -8069,9 +8068,9 @@ begin while i <= ParamCount do begin s := ParamStr(i); - if (s[1] = '-') and (Length(s) > 1) then + if (Length(s) > 1) and (s[1] = '-') then begin - if (s[2] = '-') and (Length(s) > 2) then + if (Length(s) > 2) and (s[2] = '-') then begin // Îäèíî÷íûé ïàðàìåòð SetLength(pars, Length(pars) + 1); with pars[High(pars)] do