diff --git a/src/game/g_map.pas b/src/game/g_map.pas
index ac54bd535a9d82d6e3d1c00ae97795761348f24c..ad9c68ddbb5265a3c5619febfb53e696bc53d607 100644 (file)
--- a/src/game/g_map.pas
+++ b/src/game/g_map.pas
implementation
uses
- e_input, g_main, e_log, SysUtils, g_items, g_gfx, g_console,
+ e_input, g_main, e_log, e_texture, SysUtils, g_items, g_gfx, g_console,
GL, GLExt, g_weapons, g_game, g_sound, e_sound, CONFIG,
g_options, g_triggers, g_player,
Math, g_monsters, g_saveload, g_language, g_netmsg,
end;
var
WAD: TWADFile;
- mapReader: TDynRecord = nil;
+ //mapReader: TDynRecord = nil;
mapTextureList: TDynField = nil; //TTexturesRec1Array; tagInt: texture index
panels: TDynField = nil; //TPanelsRec1Array;
items: TDynField = nil; //TItemsRec1Array;
mapGrid.Free();
mapGrid := nil;
- gCurrentMap.Free();
- gCurrentMap := nil;
+ //gCurrentMap.Free();
+ //gCurrentMap := nil;
panByGUID := nil;
Result := False;
gMapInfo.Map := Res;
TriggersTable := nil;
- mapReader := nil;
+ //mapReader := nil;
sfsGCDisable(); // temporary disable removing of temporary volumes
try
- // Çàãðóçêà WAD:
- FileName := g_ExtractWadName(Res);
- e_WriteLog('Loading map WAD: '+FileName, MSG_NOTIFY);
- g_Game_SetLoadingText(_lc[I_LOAD_WAD_FILE], 0, False);
-
- WAD := TWADFile.Create();
- if not WAD.ReadFile(FileName) then
+ // Çàãðóçêà WAD (åñëè ó íàñ íåò óæå çàãðóæåíîé êàðòû)
+ if (gCurrentMap = nil) then
begin
- g_FatalError(Format(_lc[I_GAME_ERROR_MAP_WAD], [FileName]));
- WAD.Free();
- Exit;
- end;
+ FileName := g_ExtractWadName(Res);
+ e_WriteLog('Loading map WAD: '+FileName, MSG_NOTIFY);
+ g_Game_SetLoadingText(_lc[I_LOAD_WAD_FILE], 0, False);
+
+ WAD := TWADFile.Create();
+ if not WAD.ReadFile(FileName) then
+ begin
+ g_FatalError(Format(_lc[I_GAME_ERROR_MAP_WAD], [FileName]));
+ WAD.Free();
+ Exit;
+ end;
+
+ //k8: why loader ignores path here?
+ mapResName := g_ExtractFileName(Res);
+ if not WAD.GetMapResource(mapResName, Data, Len) then
+ begin
+ g_FatalError(Format(_lc[I_GAME_ERROR_MAP_RES], [mapResName]));
+ WAD.Free();
+ Exit;
+ end;
- //k8: why loader ignores path here?
- mapResName := g_ExtractFileName(Res);
- if not WAD.GetMapResource(mapResName, Data, Len) then
- begin
- g_FatalError(Format(_lc[I_GAME_ERROR_MAP_RES], [mapResName]));
WAD.Free();
- Exit;
- end;
- WAD.Free();
+ if (Len < 4) then
+ begin
+ e_LogWritefln('invalid map file: ''%s''', [mapResName]);
+ FreeMem(Data);
+ exit;
+ end;
- if (Len < 4) then
- begin
- e_LogWritefln('invalid map file: ''%s''', [mapResName]);
- FreeMem(Data);
- exit;
- end;
+ // Çàãðóçêà êàðòû:
+ e_LogWritefln('Loading map: %s', [mapResName], MSG_NOTIFY);
+ g_Game_SetLoadingText(_lc[I_LOAD_MAP], 0, False);
- // Çàãðóçêà êàðòû:
- e_LogWritefln('Loading map: %s', [mapResName], MSG_NOTIFY);
- g_Game_SetLoadingText(_lc[I_LOAD_MAP], 0, False);
+ stt := getTimeMicro();
- stt := curTimeMicro();
+ try
+ gCurrentMap := g_Map_ParseMap(Data, Len);
+ except
+ gCurrentMap.Free();
+ g_FatalError(Format(_lc[I_GAME_ERROR_MAP_LOAD], [Res]));
+ FreeMem(Data);
+ gCurrentMapFileName := '';
+ Exit;
+ end;
- try
- mapReader := g_Map_ParseMap(Data, Len);
- except
- mapReader.Free();
- g_FatalError(Format(_lc[I_GAME_ERROR_MAP_LOAD], [Res]));
FreeMem(Data);
- Exit;
- end;
- FreeMem(Data);
-
- if (mapReader = nil) then
+ if (gCurrentMap = nil) then
+ begin
+ e_LogWritefln('invalid map file: ''%s''', [mapResName]);
+ gCurrentMapFileName := '';
+ exit;
+ end;
+ end
+ else
begin
- e_LogWritefln('invalid map file: ''%s''', [mapResName]);
- exit;
+ stt := getTimeMicro();
end;
- gCurrentMap := mapReader;
+ //gCurrentMap := mapReader;
- generateExternalResourcesList(mapReader);
- mapTextureList := mapReader['texture'];
+ generateExternalResourcesList(gCurrentMap);
+ mapTextureList := gCurrentMap['texture'];
// get all other lists here too
- panels := mapReader['panel'];
- triggers := mapReader['trigger'];
- items := mapReader['item'];
- areas := mapReader['area'];
- monsters := mapReader['monster'];
+ panels := gCurrentMap['panel'];
+ triggers := gCurrentMap['trigger'];
+ items := gCurrentMap['item'];
+ areas := gCurrentMap['area'];
+ monsters := gCurrentMap['monster'];
// Çàãðóçêà îïèñàíèÿ êàðòû:
e_WriteLog(' Reading map info...', MSG_NOTIFY);
with gMapInfo do
begin
- Name := mapReader.MapName;
- Description := mapReader.MapDesc;
- Author := mapReader.MapAuthor;
- MusicName := mapReader.MusicName;
- SkyName := mapReader.SkyName;
- Height := mapReader.Height;
- Width := mapReader.Width;
+ Name := gCurrentMap.MapName;
+ Description := gCurrentMap.MapDesc;
+ Author := gCurrentMap.MapAuthor;
+ MusicName := gCurrentMap.MusicName;
+ SkyName := gCurrentMap.SkyName;
+ Height := gCurrentMap.Height;
+ Width := gCurrentMap.Width;
end;
// Çàãðóçêà òåêñòóð:
begin
e_WriteLog('error loading map: invalid texture index for panel', MSG_FATALERROR);
result := false;
+ gCurrentMap.Free();
gCurrentMap := nil;
gCurrentMapFileName := '';
exit;
for rec in monsters do CreateMonster(rec);
end;
- gCurrentMap := mapReader; // this will be our current map now
+ //gCurrentMap := mapReader; // this will be our current map now
gCurrentMapFileName := Res;
- mapReader := nil;
+ //mapReader := nil;
// Çàãðóçêà íåáà
- if gMapInfo.SkyName <> '' then
+ if (gMapInfo.SkyName <> '') then
begin
e_WriteLog(' Loading sky: ' + gMapInfo.SkyName, MSG_NOTIFY);
g_Game_SetLoadingText(_lc[I_LOAD_SKY], 0, False);
FileName := g_ExtractWadName(gMapInfo.SkyName);
- if FileName <> '' then
- FileName := GameDir+'/wads/'+FileName
- else
- begin
- FileName := g_ExtractWadName(Res);
- end;
+ if (FileName <> '') then FileName := GameDir+'/wads/'+FileName else FileName := g_ExtractWadName(Res);
- s := FileName+':'+g_ExtractFilePathName(gMapInfo.SkyName);
- if g_Texture_CreateWAD(BackID, s) then
+ if gTextureFilter then TEXTUREFILTER := GL_LINEAR else TEXTUREFILTER := GL_NEAREST;
+ try
+ s := FileName+':'+g_ExtractFilePathName(gMapInfo.SkyName);
+ if g_Texture_CreateWAD(BackID, s) then
begin
g_Game_SetupScreenSize();
end
- else
- g_FatalError(Format(_lc[I_GAME_ERROR_SKY], [s]));
+ else
+ begin
+ g_FatalError(Format(_lc[I_GAME_ERROR_SKY], [s]));
+ end;
+ finally
+ TEXTUREFILTER := GL_NEAREST;
+ end;
end;
// Çàãðóçêà ìóçûêè
gMusic.SetByName('');
end;
- stt := curTimeMicro()-stt;
+ stt := getTimeMicro()-stt;
e_LogWritefln('map loaded in %s.%s milliseconds', [Integer(stt div 1000), Integer(stt mod 1000)]);
mapOk := true;
finally
sfsGCEnable(); // enable releasing unused volumes
- mapReader.Free();
+ //mapReader.Free();
e_ClearInputBuffer(); // why not?
if not mapOk then
begin
+ gCurrentMap.Free();
gCurrentMap := nil;
gCurrentMapFileName := '';
end;
begin
e_LogWritefln('g_Map_Free: no previous map.', []);
end;
+
if freeTextures then
begin
e_LogWritefln('g_Map_Free: clearing textures...', []);
TextNameHash := nil;
BadTextNameHash.Free();
BadTextNameHash := nil;
+ gCurrentMapFileName := '';
+ gCurrentMap.Free();
+ gCurrentMap := nil;
end;
panByGUID := nil;