X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_game.pas;h=4e2382628b74a8faa5a2198439b96e5695ae8bc8;hb=986383de4f166773e41335f5b0fec5ee5c0128f0;hp=43ccf4ff22e1b3eb6ddce0e748c52477a87007e0;hpb=75125c8752adeb3dc9e2ea3841b3b64dc23268ce;p=d2df-sdl.git diff --git a/src/game/g_game.pas b/src/game/g_game.pas index 43ccf4f..4e23826 100644 --- a/src/game/g_game.pas +++ b/src/game/g_game.pas @@ -4675,6 +4675,7 @@ begin NetState := NET_STATE_NONE; Exit; end; + e_LogWritefln('using downloaded map wad [%s] for [%s]`', [newResPath, WadName], TMsgType.Notify); end; newResPath := ExtractRelativePath(MapsDir, newResPath); @@ -4824,7 +4825,7 @@ begin end else begin - gWADHash := MD5File(nws); + if (g_Game_IsNet) then gWADHash := MD5File(nws); //writeln('********: nws=', nws, ' : Map=', Map, ' : nw=', NewWAD, ' : resname=', ResName); g_Game_LoadWAD(NewWAD); end; @@ -5010,9 +5011,10 @@ end; procedure g_Game_ClientWAD(NewWAD: String; const WHash: TMD5Digest); var - gWAD: String; + gWAD, xwad: String; begin if not g_Game_IsClient then Exit; + //e_LogWritefln('*** g_Game_ClientWAD: `%s`', [NewWAD]); gWAD := g_Res_DownloadMapWAD(ExtractFileName(NewWAD), WHash); if gWAD = '' then @@ -5022,7 +5024,9 @@ begin Exit; end; - NewWAD := ExtractRelativePath(MapsDir, gWAD); + xwad := ExtractRelativePath(MapsDir, gWAD); + e_LogWritefln('using downloaded client map wad [%s] for [%s]`', [xwad, NewWAD], TMsgType.Notify); + NewWAD := xwad; g_Game_LoadWAD(NewWAD); {