X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_saveload.pas;h=d603440d839241a9c3513f59140ae34d0ca755ba;hb=e979719019322a78e7fded8fd96130c18cf31972;hp=09f5076c9b919fc95d9f96a09f672f20193bc24b;hpb=a959696d242bc66e6890d281eb6e5d627c2588e9;p=d2df-sdl.git diff --git a/src/game/g_saveload.pas b/src/game/g_saveload.pas index 09f5076..d603440 100644 --- a/src/game/g_saveload.pas +++ b/src/game/g_saveload.pas @@ -18,8 +18,7 @@ unit g_saveload; interface uses - SysUtils, Classes, - e_graphics, g_phys, g_textures; + SysUtils, Classes, g_phys, g_textures; function g_GetSaveName (n: Integer; out valid: Boolean): AnsiString; @@ -39,9 +38,9 @@ implementation uses MAPDEF, utils, xstreams, g_game, g_items, g_map, g_monsters, g_triggers, - g_basic, g_main, Math, wadreader, + g_basic, Math, wadreader, g_weapons, g_player, g_console, - e_log, e_res, g_language; + e_log, e_res, g_language, g_options; const SAVE_SIGNATURE = $56534644; // 'DFSV' @@ -180,7 +179,7 @@ begin //if (Length(gCurrentMapFileName) <> 0) then e_LogWritefln('SAVE: current map is ''%s''...', [gCurrentMapFileName]); utils.writeStr(st, gCurrentMapFileName); // Ïóòü ê êàðòå - utils.writeStr(st, gGameSettings.WAD); + utils.writeStr(st, ExtractFileName(gGameSettings.WAD)); // Èìÿ êàðòû utils.writeStr(st, g_ExtractFileName(gMapInfo.Map)); // Êîëè÷åñòâî èãðîêîâ @@ -399,9 +398,6 @@ begin end; g_Game_ExecuteEvent('ongamestart'); - // Óñòàíîâêà ðàçìåðîâ îêîí èãðîêîâ - g_Game_SetupScreenSize(); - // Çàãðóçêà è çàïóñê êàðòû //FIXME: save/load `asMegawad` if not g_Game_StartMap(false{asMegawad}, WAD_Path+':\'+Map_Name, True, curmapfile) then