cleanup: remove g_main.pas

[d2df-sdl.git] / src / game / g_res_downloader.pas

diff --git a/src/game/g_res_downloader.pas b/src/game/g_res_downloader.pas
index f334e2f806d30ce5753aa533449888a99d15cfe8..8bd5e04cd70ddd6dcd87e2be585261c3e067c480 100644 (file)
--- a/src/game/g_res_downloader.pas
+++ b/src/game/g_res_downloader.pas
@@ -17,7 +17,7 @@ unit g_res_downloader;
 
 interface
 
-uses sysutils, Classes, md5, g_net, g_netmsg, g_console, g_main, e_log;
+uses sysutils, Classes, md5, g_net, g_netmsg, g_console, e_log;
 
 
 // download map wad from server (if necessary)
@@ -35,7 +35,7 @@ procedure g_Res_CreateDatabases (allowRescan: Boolean=false);
 
 implementation
 
-uses g_language, sfs, utils, wadreader, g_game, hashtable, fhashdb, e_res;
+uses g_language, sfs, utils, wadreader, g_game, hashtable, fhashdb, e_res, g_options;
 
 var
   // cvars
@@ -373,16 +373,15 @@ begin
   clearReplacementWads();
   sfsGCCollect(); // why not?
   g_Res_CreateDatabases();
+  FileName := ExtractFileName(FileName);
+  if (length(FileName) = 0) then FileName := '__unititled__.wad';
 
   try
     g_Res_received_map_start := 1;
     g_Console_Add(Format(_lc[I_NET_MAP_DL], [FileName]));
-    e_WriteLog('Downloading map `' + FileName + '` from server', TMsgType.Notify);
+    e_LogWritefln('Downloading map [%s] from server...', [FileName], TMsgType.Notify);
     g_Game_SetLoadingText(FileName + '...', 0, False);
 
-    FileName := ExtractFileName(FileName);
-    if (length(FileName) = 0) then FileName := 'fucked_map_wad.wad';
-
     // this also sends map request
     res := g_Net_Wait_MapInfo(tf, resList);
     if (res <> 0) then exit;