Game/Net: Fix client map hash

Doom2D · Jan 8, 2016 · d2b0e2f · d2b0e2f
1 parent 4242b24
commit d2b0e2f
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/DF Sources/g_game.pas b/DF Sources/g_game.pas
@@ -3578,10 +3578,12 @@ function g_Game_StartMap(Map: String; Force: Boolean = False): Boolean;
   if Pos(':\', Map) > 0 then
   begin
     g_ProcessResourceStr(Map, @NewWAD, nil, @ResName);
-    gWADHash := MD5File(MapsDir + NewWAD);
     if g_Game_IsServer then
-      g_Game_LoadWAD(NewWAD)
-    else
+    begin
+      gWADHash := MD5File(MapsDir + NewWAD);
+      g_Game_LoadWAD(NewWAD);
+    end else
+      // hash recieved in MC_RECV_GameEvent -> NET_EV_MAPSTART 
       g_Game_ClientWAD(NewWAD, gWADHash);
   end else
     ResName := Map;

diff --git a/DF Sources/g_netmsg.pas b/DF Sources/g_netmsg.pas
@@ -1594,6 +1594,7 @@ procedure MC_RECV_GameEvent(P: Pointer);
       g_Game_ClearLoading();
       g_Game_StopAllSounds(True);
 
+      gWADHash := EvHash;
       if not g_Game_StartMap(EvParm, True) then
       begin
         if Pos(':\', EvParm) = 0 then

diff --git a/DF Sources/g_res_downloader.pas b/DF Sources/g_res_downloader.pas
@@ -113,8 +113,11 @@ function g_Res_DownloadWAD(const FileName: string): string;
   MC_SEND_MapRequest();
 
   msgStream := g_Net_Wait_Event(NET_MSG_MAP_RESPONSE);
-  mapData := MapDataFromMsgStream(msgStream);
-  msgStream.Free;
+  if msgStream <> nil then
+  begin
+    mapData := MapDataFromMsgStream(msgStream);
+    msgStream.Free;
+  end;
 
   for i := 0 to High(mapData.ExternalResources) do
   begin