index 4e5697465bfc8b8c42ede7cc174ebc3e2dc07742..32f6821770c20af0affaf213d2b5ee23853e6cc2 100644 (file)
--- a/src/game/g_saveload.pas
+++ b/src/game/g_saveload.pas
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;
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'
//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));
// Êîëè÷åñòâî èãðîêîâ
g_Game_SetupScreenSize();
// Çàãðóçêà è çàïóñê êàðòû
- if not g_Game_StartMap(WAD_Path+':\'+Map_Name, True, curmapfile) then
+ //FIXME: save/load `asMegawad`
+ if not g_Game_StartMap(false{asMegawad}, WAD_Path+':\'+Map_Name, True, curmapfile) then
begin
g_FatalError(Format(_lc[I_GAME_ERROR_MAP_LOAD], [WAD_Path + ':\' + Map_Name]));
exit;