diff --git a/src/game/g_game.pas b/src/game/g_game.pas
index babcb8e2cd3e7f2a19b28a00218cc5d3ea107416..43ccf4ff22e1b3eb6ddce0e748c52477a87007e0 100644 (file)
--- a/src/game/g_game.pas
+++ b/src/game/g_game.pas
begin
if (NetEvent.kind = ENET_EVENT_TYPE_RECEIVE) then
begin
begin
if (NetEvent.kind = ENET_EVENT_TYPE_RECEIVE) then
begin
+ if (NetEvent.channelID = NET_CHAN_DOWNLOAD_EX) then
+ begin
+ // ignore all download packets, they're processed by separate code
+ enet_packet_destroy(NetEvent.packet);
+ continue;
+ end;
Ptr := NetEvent.packet^.data;
if not InMsg.Init(Ptr, NetEvent.packet^.dataLength, True) then
Ptr := NetEvent.packet^.data;
if not InMsg.Init(Ptr, NetEvent.packet^.dataLength, True) then
+ begin
+ enet_packet_destroy(NetEvent.packet);
continue;
continue;
+ end;
InMsg.ReadLongWord(); // skip size
MID := InMsg.ReadByte();
InMsg.ReadLongWord(); // skip size
MID := InMsg.ReadByte();
gGameSettings.Options := InMsg.ReadLongWord();
T := InMsg.ReadLongWord();
gGameSettings.Options := InMsg.ReadLongWord();
T := InMsg.ReadLongWord();
- newResPath := g_Res_SearchSameWAD(MapsDir, WadName, gWADHash);
- if newResPath = '' then
+ //newResPath := g_Res_SearchSameWAD(MapsDir, WadName, gWADHash);
+ //if newResPath = '' then
begin
begin
- g_Game_SetLoadingText(_lc[I_LOAD_DL_RES], 0, False);
+ //g_Game_SetLoadingText(_lc[I_LOAD_DL_RES], 0, False);
newResPath := g_Res_DownloadMapWAD(WadName, gWADHash);
if newResPath = '' then
begin
newResPath := g_Res_DownloadMapWAD(WadName, gWADHash);
if newResPath = '' then
begin
var
gWAD: String;
begin
var
gWAD: String;
begin
- if LowerCase(NewWAD) = LowerCase(gGameSettings.WAD) then
- Exit;
- if not g_Game_IsClient then
+ if not g_Game_IsClient then Exit;
+
+ gWAD := g_Res_DownloadMapWAD(ExtractFileName(NewWAD), WHash);
+ if gWAD = '' then
+ begin
+ g_Game_Free();
+ g_FatalError(Format(_lc[I_GAME_ERROR_MAP_WAD], [ExtractFileName(NewWAD)]));
Exit;
Exit;
+ end;
+
+ NewWAD := ExtractRelativePath(MapsDir, gWAD);
+ g_Game_LoadWAD(NewWAD);
+
+ {
+ if LowerCase(NewWAD) = LowerCase(gGameSettings.WAD) then Exit;
gWAD := g_Res_SearchSameWAD(MapsDir, ExtractFileName(NewWAD), WHash);
if gWAD = '' then
begin
gWAD := g_Res_SearchSameWAD(MapsDir, ExtractFileName(NewWAD), WHash);
if gWAD = '' then
begin
end;
NewWAD := ExtractRelativePath(MapsDir, gWAD);
g_Game_LoadWAD(NewWAD);
end;
NewWAD := ExtractRelativePath(MapsDir, gWAD);
g_Game_LoadWAD(NewWAD);
+ }
end;
procedure g_Game_RestartRound(NoMapRestart: Boolean = False);
end;
procedure g_Game_RestartRound(NoMapRestart: Boolean = False);