diff --git a/src/game/g_map.pas b/src/game/g_map.pas
index 25b1bfe8e086400f050d115a78c9ffc64010d0ab..5bca6b012ad82226e39827f88ec5c92fd89d7add 100644 (file)
--- a/src/game/g_map.pas
+++ b/src/game/g_map.pas
GL, GLExt, g_weapons, g_game, g_sound, e_sound, CONFIG,
g_options, MAPREADER, g_triggers, g_player, MAPDEF,
Math, g_monsters, g_saveload, g_language, g_netmsg,
- utils, sfs;
+ utils, sfs,
+ ImagingTypes, Imaging, ImagingUtility,
+ ImagingGif, ImagingNetworkGraphics;
const
FLAGRECT: TRectWH = (X:15; Y:12; Width:33; Height:52);
var
WAD: TWADFile;
TextureData: Pointer;
- WADName: String;
- SectionName: String;
- TextureName: String;
+ WADName, txname: String;
a, ResLength: Integer;
begin
Result := -1;
end;
// Çàãðóæàåì ðåñóðñ òåêñòóðû â ïàìÿòü èç WAD'à:
- g_ProcessResourceStr(RecName, WADName, SectionName, TextureName);
+ WADName := g_ExtractWadName(RecName);
WAD := TWADFile.Create();
WAD.ReadFile(WADName);
- if WAD.GetResource(SectionName, TextureName, TextureData, ResLength) then
+ txname := RecName;
+ {
+ if (WADName = Map) and WAD.GetResource(g_ExtractFilePathName(RecName), TextureData, ResLength) then
+ begin
+ FreeMem(TextureData);
+ RecName := 'COMMON\ALIEN';
+ end;
+ }
+
+ if WAD.GetResource(g_ExtractFilePathName(RecName), TextureData, ResLength) then
begin
SetLength(Textures, Length(Textures)+1);
- if not e_CreateTextureMem(TextureData, Textures[High(Textures)].TextureID) then
+ if not e_CreateTextureMem(TextureData, ResLength, Textures[High(Textures)].TextureID) then
Exit;
e_GetTextureSize(Textures[High(Textures)].TextureID,
@Textures[High(Textures)].Width,
@Textures[High(Textures)].Height);
FreeMem(TextureData);
- Textures[High(Textures)].TextureName := RecName;
+ Textures[High(Textures)].TextureName := {RecName}txname;
Textures[High(Textures)].Anim := False;
result := High(Textures);
end
else // Íåò òàêîãî ðåóñðñà â WAD'å
+ begin
+ //e_WriteLog(Format('SHIT! Error loading texture %s : %s : %s', [RecName, txname, g_ExtractFilePathName(RecName)]), MSG_WARNING);
if log then
begin
e_WriteLog(Format('Error loading texture %s', [RecName]), MSG_WARNING);
//e_WriteLog(Format('WAD Reader error: %s', [WAD.GetLastErrorStr]), MSG_WARNING);
end;
+ end;
WAD.Free();
end;
function CreateAnimTexture(RecName: String; Map: string; log: Boolean): Integer;
var
WAD: TWADFile;
- TextureWAD: Pointer;
- TextData: Pointer;
- TextureData: Pointer;
- cfg: TConfig;
+ TextureWAD: PChar = nil;
+ ttw: PChar = nil;
+ TextData: Pointer = nil;
+ TextureData: Pointer = nil;
+ cfg: TConfig = nil;
WADName: String;
- SectionName: String;
- TextureName: String;
- ResLength: Integer;
+ ResLength, rrl: Integer;
TextureResource: String;
_width, _height, _framecount, _speed: Integer;
_backanimation: Boolean;
+ imgfmt: string;
+ ia: TDynImageDataArray = nil;
+ il: TImageFileFormat = nil;
+ meta: TMetadata = nil;
+ f, c: Integer;
+ gf: TGIFFileFormat;
+ pf: TPNGFileFormat;
begin
- Result := -1;
+ result := -1;
+
+ //e_WriteLog(Format('*** Loading animated texture "%s"', [RecName]), MSG_NOTIFY);
-// ×èòàåì WAD-ðåñóðñ àíèì.òåêñòóðû èç WAD'à â ïàìÿòü:
- g_ProcessResourceStr(RecName, WADName, SectionName, TextureName);
+ // ×èòàåì WAD-ðåñóðñ àíèì.òåêñòóðû èç WAD'à â ïàìÿòü:
+ WADName := g_ExtractWadName(RecName);
WAD := TWADFile.Create();
+ try
+ if WADName <> '' then
+ WADName := GameDir+'/wads/'+WADName
+ else
+ WADName := Map;
- if WADName <> '' then
- WADName := GameDir+'/wads/'+WADName
- else
- WADName := Map;
+ WAD.ReadFile(WADName);
- WAD.ReadFile(WADName);
+ if not WAD.GetResource(g_ExtractFilePathName(RecName), TextureWAD, ResLength) then
+ begin
+ if log then
+ begin
+ e_WriteLog(Format('Error loading animation texture %s', [RecName]), MSG_WARNING);
+ //e_WriteLog(Format('WAD Reader error: %s', [WAD.GetLastErrorStr]), MSG_WARNING);
+ end;
+ exit;
+ end;
- if not WAD.GetResource(SectionName, TextureName, TextureWAD, ResLength) then
- begin
- if log then
+ {TEST
+ if WADName = Map then
begin
- e_WriteLog(Format('Error loading animation texture %s', [RecName]), MSG_WARNING);
- //e_WriteLog(Format('WAD Reader error: %s', [WAD.GetLastErrorStr]), MSG_WARNING);
+ //FreeMem(TextureWAD);
+ if not WAD.GetResource('COMMON/animation', TextureWAD, ResLength) then Halt(1);
end;
- WAD.Free();
- Exit;
- end;
+ }
- WAD.FreeWAD();
+ WAD.FreeWAD();
- if not WAD.ReadMemory(TextureWAD, ResLength) then
- begin
- FreeMem(TextureWAD);
- WAD.Free();
- Exit;
- end;
+ if ResLength < 6 then
+ begin
+ e_WriteLog(Format('Animated texture file "%s" too short', [RecName]), MSG_WARNING);
+ exit;
+ end;
-// ×èòàåì INI-ðåñóðñ àíèì. òåêñòóðû è çàïîìèíàåì åãî óñòàíîâêè:
- if not WAD.GetResource('TEXT', 'ANIM', TextData, ResLength) then
- begin
- FreeMem(TextureWAD);
- WAD.Free();
- Exit;
- end;
+ // ýòî ïòèöà? ýòî ñàìîë¸ò?
+ if (TextureWAD[0] = 'D') and (TextureWAD[1] = 'F') and
+ (TextureWAD[2] = 'W') and (TextureWAD[3] = 'A') and (TextureWAD[4] = 'D') then
+ begin
+ // íåò, ýòî ñóïåðìåí!
+ if not WAD.ReadMemory(TextureWAD, ResLength) then
+ begin
+ e_WriteLog(Format('Animated texture WAD file "%s" is invalid', [RecName]), MSG_WARNING);
+ exit;
+ end;
- cfg := TConfig.CreateMem(TextData, ResLength);
+ // ×èòàåì INI-ðåñóðñ àíèì. òåêñòóðû è çàïîìèíàåì åãî óñòàíîâêè:
+ if not WAD.GetResource('TEXT/ANIM', TextData, ResLength) then
+ begin
+ e_WriteLog(Format('Animated texture file "%s" has invalid INI', [RecName]), MSG_WARNING);
+ exit;
+ end;
- TextureResource := cfg.ReadStr('', 'resource', '');
+ cfg := TConfig.CreateMem(TextData, ResLength);
- if TextureResource = '' then
- begin
- FreeMem(TextureWAD);
- FreeMem(TextData);
- WAD.Free();
- cfg.Free();
- Exit;
- end;
+ TextureResource := cfg.ReadStr('', 'resource', '');
+ if TextureResource = '' then
+ begin
+ e_WriteLog(Format('Animated texture WAD file "%s" has no "resource"', [RecName]), MSG_WARNING);
+ exit;
+ end;
- _width := cfg.ReadInt('', 'framewidth', 0);
- _height := cfg.ReadInt('', 'frameheight', 0);
- _framecount := cfg.ReadInt('', 'framecount', 0);
- _speed := cfg.ReadInt('', 'waitcount', 0);
- _backanimation := cfg.ReadBool('', 'backanimation', False);
+ _width := cfg.ReadInt('', 'framewidth', 0);
+ _height := cfg.ReadInt('', 'frameheight', 0);
+ _framecount := cfg.ReadInt('', 'framecount', 0);
+ _speed := cfg.ReadInt('', 'waitcount', 0);
+ _backanimation := cfg.ReadBool('', 'backanimation', False);
- cfg.Free();
+ cfg.Free();
+ cfg := nil;
-// ×èòàåì ðåñóðñ òåêñòóð (êàäðîâ) àíèì. òåêñòóðû â ïàìÿòü:
- if not WAD.GetResource('TEXTURES', TextureResource, TextureData, ResLength) then
- begin
- FreeMem(TextureWAD);
- FreeMem(TextData);
- WAD.Free();
- Exit;
- end;
+ // ×èòàåì ðåñóðñ òåêñòóð (êàäðîâ) àíèì. òåêñòóðû â ïàìÿòü:
+ if not WAD.GetResource('TEXTURES/'+TextureResource, TextureData, ResLength) then
+ begin
+ e_WriteLog(Format('Animated texture WAD file "%s" has no texture "%s"', [RecName, 'TEXTURES/'+TextureResource]), MSG_WARNING);
+ exit;
+ end;
- WAD.Free();
+ WAD.Free();
+ WAD := nil;
- SetLength(Textures, Length(Textures)+1);
- with Textures[High(Textures)] do
- begin
- // Ñîçäàåì êàäðû àíèì. òåêñòóðû èç ïàìÿòè:
- if g_Frames_CreateMemory(@FramesID, '', TextureData,
- _width, _height, _framecount, _backanimation) then
+ SetLength(Textures, Length(Textures)+1);
+ with Textures[High(Textures)] do
+ begin
+ // Ñîçäàåì êàäðû àíèì. òåêñòóðû èç ïàìÿòè:
+ if g_Frames_CreateMemory(@FramesID, '', TextureData, ResLength, _width, _height, _framecount, _backanimation) then
+ begin
+ TextureName := RecName;
+ Width := _width;
+ Height := _height;
+ Anim := True;
+ FramesCount := _framecount;
+ Speed := _speed;
+ result := High(Textures);
+ end
+ else
+ begin
+ if log then e_WriteLog(Format('Error loading animation texture %s', [RecName]), MSG_WARNING);
+ end;
+ end;
+ end
+ else
+ begin
+ // try animated image
+ imgfmt := DetermineMemoryFormat(TextureWAD, ResLength);
+ if length(imgfmt) = 0 then
+ begin
+ e_WriteLog(Format('Animated texture file "%s" has unknown format', [RecName]), MSG_WARNING);
+ exit;
+ end;
+ if imgfmt = 'gif' then
+ begin
+ meta := TMetadata.Create();
+ gf := TGIFFileFormat.Create(meta);
+ gf.LoadAnimated := true;
+ il := gf;
+ end
+ else if imgfmt = 'png' then
+ begin
+ meta := TMetadata.Create();
+ pf := TPNGFileFormat.Create(meta);
+ pf.LoadAnimated := true;
+ il := pf;
+ end;
+ if il <> nil then
+ begin
+ if not il.LoadFromMemory(TextureWAD, ResLength, ia) then
+ begin
+ e_WriteLog(Format('Animated texture file "%s" cannot be loaded', [RecName]), MSG_WARNING);
+ exit;
+ end;
+ end
+ else if LoadMultiImageFromMemory(TextureWAD, ResLength, ia) then
begin
- TextureName := RecName;
- Width := _width;
- Height := _height;
- Anim := True;
- FramesCount := _framecount;
- Speed := _speed;
+ if length(ia) > 1 then
+ begin
+ for f := 1 to High(ia) do FreeImage(ia[f]);
+ SetLength(ia, 1);
+ end;
+ end
+ else
+ begin
+ e_WriteLog(Format('Animated texture file "%s" cannot be loaded', [RecName]), MSG_WARNING);
+ exit;
+ end;
+ if length(ia) = 0 then
+ begin
+ e_WriteLog(Format('Animated texture file "%s" has no frames', [RecName]), MSG_WARNING);
+ exit;
+ end;
+ WAD.Free();
+ WAD := nil;
+
+ _width := ia[0].width;
+ _height := ia[0].height;
+ _framecount := length(ia);
+ _speed := 1;
+ _backanimation := false;
+ if meta <> nil then
+ begin
+ if meta.HasMetaItem(SMetaFrameDelay) then
+ begin
+ //writeln(' frame delay: ', meta.MetaItems[SMetaFrameDelay]);
+ try
+ f := meta.MetaItems[SMetaFrameDelay];
+ if f < 0 then f := 0;
+ // rounding ;-)
+ c := f mod 27;
+ if c < 13 then c := 0 else c := 1;
+ f := (f div 27)+c;
+ if f < 1 then f := 1 else if f > 255 then f := 255;
+ _speed := f;
+ except
+ end;
+ end;
+ if meta.HasMetaItem(SMetaAnimationLoops) then
+ begin
+ //writeln(' frame loop : ', meta.MetaItems[SMetaAnimationLoops]);
+ try
+ f := meta.MetaItems[SMetaAnimationLoops];
+ if f <> 0 then _backanimation := true;
+ except
+ end;
+ end;
+ end;
+ //writeln(' creating animated texture with ', length(ia), ' frames (delay:', _speed, '; backloop:', _backanimation, ') from "', RecName, '"...');
+ //for f := 0 to high(ia) do writeln(' frame #', f, ': ', ia[f].width, 'x', ia[f].height);
+ //e_WriteLog(Format('Animated texture file "%s": %d frames (delay:%d), %dx%d', [RecName, length(ia), _speed, _width, _height]), MSG_NOTIFY);
+
+ SetLength(Textures, Length(Textures)+1);
+ // cîçäàåì êàäðû àíèì. òåêñòóðû èç êàðòèíîê
+ if g_CreateFramesImg(ia, @Textures[High(Textures)].FramesID, '', _backanimation) then
+ begin
+ Textures[High(Textures)].TextureName := RecName;
+ Textures[High(Textures)].Width := _width;
+ Textures[High(Textures)].Height := _height;
+ Textures[High(Textures)].Anim := True;
+ Textures[High(Textures)].FramesCount := length(ia);
+ Textures[High(Textures)].Speed := _speed;
result := High(Textures);
+ //writeln(' CREATED!');
end
- else
- if log then
- e_WriteLog(Format('Error loading animation texture %s', [RecName]), MSG_WARNING);
+ else
+ begin
+ if log then e_WriteLog(Format('Error loading animation texture "%s" images', [RecName]), MSG_WARNING);
+ end;
+ end;
+ finally
+ for f := 0 to High(ia) do FreeImage(ia[f]);
+ il.Free();
+ //???meta.Free();
+ WAD.Free();
+ cfg.Free();
+ if TextureWAD <> nil then FreeMem(TextureWAD);
+ if TextData <> nil then FreeMem(TextData);
+ if TextureData <> nil then FreeMem(TextureData);
end;
-
- FreeMem(TextureWAD);
- FreeMem(TextData);
end;
procedure CreateItem(Item: TItemRec_1);
DoorPanel: Integer;
ShotPanel: Integer;
end;
- FileName, SectionName, ResName,
- FileName2, s, TexName: String;
+ FileName, mapResName, s, TexName: String;
Data: Pointer;
Len: Integer;
ok, isAnim, trigRef: Boolean;
sfsGCDisable(); // temporary disable removing of temporary volumes
try
// Çàãðóçêà WAD:
- g_ProcessResourceStr(Res, FileName, SectionName, ResName);
- e_WriteLog('Loading map WAD: ' + FileName, MSG_NOTIFY);
+ 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();
WAD.Free();
Exit;
end;
- if not WAD.GetResource('', ResName, Data, Len) then
+ //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], [ResName]));
+ g_FatalError(Format(_lc[I_GAME_ERROR_MAP_RES], [mapResName]));
WAD.Free();
Exit;
end;
WAD.Free();
// Çàãðóçêà êàðòû:
- e_WriteLog('Loading map: ' + ResName, MSG_NOTIFY);
+ e_WriteLog('Loading map: '+mapResName, MSG_NOTIFY);
g_Game_SetLoadingText(_lc[I_LOAD_MAP], 0, False);
MapReader := TMapReader_1.Create();
begin
e_WriteLog(' Loading sky: ' + gMapInfo.SkyName, MSG_NOTIFY);
g_Game_SetLoadingText(_lc[I_LOAD_SKY], 0, False);
- g_ProcessResourceStr(gMapInfo.SkyName, FileName, SectionName, ResName);
+ FileName := g_ExtractWadName(gMapInfo.SkyName);
if FileName <> '' then
FileName := GameDir+'/wads/'+FileName
else
begin
- g_ProcessResourceStr(Res, @FileName2, nil, nil);
- FileName := FileName2;
+ FileName := g_ExtractWadName(Res);
end;
- s := FileName+':'+SectionName+'/'+ResName;
+ s := FileName+':'+g_ExtractFilePathName(gMapInfo.SkyName);
if g_Texture_CreateWAD(BackID, s) then
begin
g_Game_SetupScreenSize();
begin
e_WriteLog(' Loading music: ' + gMapInfo.MusicName, MSG_NOTIFY);
g_Game_SetLoadingText(_lc[I_LOAD_MUSIC], 0, False);
- g_ProcessResourceStr(gMapInfo.MusicName, FileName, SectionName, ResName);
+ FileName := g_ExtractWadName(gMapInfo.MusicName);
if FileName <> '' then
FileName := GameDir+'/wads/'+FileName
else
begin
- g_ProcessResourceStr(Res, @FileName2, nil, nil);
- FileName := FileName2;
+ FileName := g_ExtractWadName(Res);
end;
- s := FileName+':'+SectionName+'/'+ResName;
+ s := FileName+':'+g_ExtractFilePathName(gMapInfo.MusicName);
if g_Sound_CreateWADEx(gMapInfo.MusicName, s, True) then
ok := True
else
WAD: TWADFile;
MapReader: TMapReader_1;
Header: TMapHeaderRec_1;
- FileName, SectionName, ResName: String;
+ FileName: String;
Data: Pointer;
Len: Integer;
begin
FillChar(Result, SizeOf(Result), 0);
- g_ProcessResourceStr(Res, FileName, SectionName, ResName);
+ FileName := g_ExtractWadName(Res);
WAD := TWADFile.Create();
if not WAD.ReadFile(FileName) then
Exit;
end;
- if not WAD.GetResource('', ResName, Data, Len) then
+ //k8: it ignores path again
+ if not WAD.GetMapResource(g_ExtractFileName(Res), Data, Len) then
begin
WAD.Free();
Exit;
WAD: TWADFile;
a: Integer;
ResList: SArray;
- Data: Pointer;
- Len: Integer;
- Sign: Array [0..2] of Char;
begin
Result := nil;
-
WAD := TWADFile.Create();
if not WAD.ReadFile(WADName) then
begin
WAD.Free();
Exit;
end;
-
- ResList := WAD.GetResourcesList('');
-
+ ResList := WAD.GetMapResources();
if ResList <> nil then
+ begin
for a := 0 to High(ResList) do
begin
- if not WAD.GetResource('', ResList[a], Data, Len) then Continue;
- CopyMemory(@Sign[0], Data, 3);
- FreeMem(Data);
-
- if Sign = MAP_SIGNATURE then
- begin
- SetLength(Result, Length(Result)+1);
- Result[High(Result)] := ResList[a];
- end;
-
- Sign := '';
+ SetLength(Result, Length(Result)+1);
+ Result[High(Result)] := ResList[a];
end;
-
+ end;
WAD.Free();
end;
function g_Map_Exist(Res: string): Boolean;
var
WAD: TWADFile;
- FileName, SectionName, ResName: string;
+ FileName, mnn: string;
ResList: SArray;
a: Integer;
begin
Result := False;
- g_ProcessResourceStr(Res, FileName, SectionName, ResName);
-
- FileName := addWadExtension(FileName);
+ FileName := addWadExtension(g_ExtractWadName(Res));
WAD := TWADFile.Create;
if not WAD.ReadFile(FileName) then
Exit;
end;
- ResList := WAD.GetResourcesList('');
+ ResList := WAD.GetMapResources();
WAD.Free();
+ mnn := g_ExtractFileName(Res);
if ResList <> nil then
- for a := 0 to High(ResList) do if ResList[a] = ResName then
+ for a := 0 to High(ResList) do if StrEquCI1251(ResList[a], mnn) then
begin
Result := True;
Exit;