diff --git a/src/game/g_game.pas b/src/game/g_game.pas
index 26465349d5047fb6dc9de60e125f7607174d662f..081d97e892b2af312e668557e532308f8cbfed02 100644 (file)
--- a/src/game/g_game.pas
+++ b/src/game/g_game.pas
g_Game_SetLoadingText(_lc[I_LOAD_MUSIC], 0, False);
g_Sound_CreateWADEx('MUSIC_INTERMUS', GameWAD+':MUSIC\INTERMUS', True);
g_Sound_CreateWADEx('MUSIC_MENU', GameWAD+':MUSIC\MENU', True);
- g_Sound_CreateWADEx('MUSIC_ROUNDMUS', GameWAD+':MUSIC\ROUNDMUS', True);
+ g_Sound_CreateWADEx('MUSIC_ROUNDMUS', GameWAD+':MUSIC\ROUNDMUS', True, True);
g_Sound_CreateWADEx('MUSIC_STDENDMUS', GameWAD+':MUSIC\ENDMUS', True);
g_Game_SetLoadingText(_lc[I_LOAD_MENUS], 0, False);
end else
begin
// Òàêîé êàðòû íåò, èùåì WAD ôàéë
- P[1] := addWadExtension(P[1]);
- g_Console_Add(Format(_lc[I_MSG_NO_MAP_FALLBACK], [s, P[1]]));
- if FileExists(MapsDir + P[1]) then
+ pw := findDiskWad(MapsDir + P[1]);
+ g_Console_Add(Format(_lc[I_MSG_NO_MAP_FALLBACK], [s, 'WAD ' + P[1]]));
+ if FileExists(pw) then
begin
// Ïàðàìåòðà êàðòû íåò, ïîýòîìó ñòàâèì ïåðâóþ èç ôàéëà
SetLength(P, 3);
+ P[1] := ExtractRelativePath(MapsDir, pw);
P[2] := g_Game_GetFirstMap(MapsDir + P[1]);
s := P[1] + ':\' + P[2];
begin
g_TakeScreenShot()
end
- else if cmd = 'togglechat' then
- begin
- g_Console_Chat_Switch(False);
- gSkipFirstChar := not g_Console_Interactive()
- end
- else if cmd = 'toggleteamchat' then
- begin
- if gGameSettings.GameMode in [GM_TDM, GM_CTF] then
- begin
- g_Console_Chat_Switch(True);
- gSkipFirstChar := not g_Console_Interactive()
- end
- end
else if cmd = 'weapon' then
begin
if Length(p) = 2 then