diff --git a/src/game/g_map.pas b/src/game/g_map.pas
index 5bca6b012ad82226e39827f88ec5c92fd89d7add..9f9465be47c90c65f63f3cd05a639d12fe95e1e5 100644 (file)
--- a/src/game/g_map.pas
+++ b/src/game/g_map.pas
+(* Copyright (C) DooM 2D:Forever Developers
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *)
{$MODE DELPHI}
unit g_map;
Direction: TDirection;
end;
-
function g_Map_Load(Res: String): Boolean;
function g_Map_GetMapInfo(Res: String): TMapInfo;
function g_Map_GetMapsList(WADName: String): SArray;
procedure g_Map_ResetFlag(Flag: Byte);
procedure g_Map_DrawFlags();
+function g_Map_PanelForPID(PanelID: Integer; var PanelArrayID: Integer): PPanel;
+
procedure g_Map_SaveState(Var Mem: TBinMemoryWriter);
procedure g_Map_LoadState(Var Mem: TBinMemoryReader);
MUSIC_SIGNATURE = $4953554D; // 'MUSI'
FLAG_SIGNATURE = $47414C46; // 'FLAG'
+type
+ TPanelID = record
+ PWhere: ^TPanelArray;
+ PArrID: Integer;
+ end;
+
var
+ PanelById: array of TPanelID;
Textures: TLevelTextureArray;
RespawnPoints: Array of TRespawnPoint;
FlagPoints: Array [FLAG_RED..FLAG_BLUE] of PFlagPoint;
panels^[len].SaveIt := True;
Result := len;
+
+ len := Length(PanelByID);
+ SetLength(PanelByID, len + 1);
+ PanelByID[len].PWhere := panels;
+ PanelByID[len].PArrID := Result;
end;
function CreateNullTexture(RecName: String): Integer;
@@ -460,22 +488,17 @@ function CreateAnimTexture(RecName: String; Map: string; log: Boolean): Integer;
var
WAD: TWADFile;
TextureWAD: PChar = nil;
- ttw: PChar = nil;
TextData: Pointer = nil;
TextureData: Pointer = nil;
cfg: TConfig = nil;
WADName: String;
- ResLength, rrl: Integer;
+ ResLength: Integer;
TextureResource: String;
_width, _height, _framecount, _speed: Integer;
_backanimation: Boolean;
- imgfmt: string;
+ //imgfmt: string;
ia: TDynImageDataArray = nil;
- il: TImageFileFormat = nil;
- meta: TMetadata = nil;
- f, c: Integer;
- gf: TGIFFileFormat;
- pf: TPNGFileFormat;
+ f, c, frdelay, frloop: Integer;
begin
result := -1;
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
- if length(ia) > 1 then
- begin
- for f := 1 to High(ia) do FreeImage(ia[f]);
- SetLength(ia, 1);
- end;
- end
- else
+ }
+ GlobalMetadata.ClearMetaItems();
+ GlobalMetadata.ClearMetaItemsForSaving();
+ if not LoadMultiImageFromMemory(TextureWAD, ResLength, ia) then
begin
e_WriteLog(Format('Animated texture file "%s" cannot be loaded', [RecName]), MSG_WARNING);
exit;
_framecount := length(ia);
_speed := 1;
_backanimation := false;
- if meta <> nil then
+ frdelay := -1;
+ frloop := -666;
+ if GlobalMetadata.HasMetaItem(SMetaFrameDelay) 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;
+ //writeln(' frame delay: ', GlobalMetadata.MetaItems[SMetaFrameDelay]);
+ try
+ f := GlobalMetadata.MetaItems[SMetaFrameDelay];
+ frdelay := f;
+ if f < 0 then f := 0;
+ // rounding ;-)
+ c := f mod 28;
+ if c < 13 then c := 0 else c := 1;
+ f := (f div 28)+c;
+ if f < 1 then f := 1 else if f > 255 then f := 255;
+ _speed := f;
+ except
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;
+ if GlobalMetadata.HasMetaItem(SMetaAnimationLoops) then
+ begin
+ //writeln(' frame loop : ', GlobalMetadata.MetaItems[SMetaAnimationLoops]);
+ try
+ f := GlobalMetadata.MetaItems[SMetaAnimationLoops];
+ frloop := f;
+ if f <> 0 then _backanimation := true; // non-infinite looping == forth-and-back
+ except
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);
+ f := ord(_backanimation);
+ e_WriteLog(Format('Animated texture file "%s": %d frames (delay:%d; back:%d; frdelay:%d; frloop:%d), %dx%d', [RecName, length(ia), _speed, f, frdelay, frloop, _width, _height]), MSG_NOTIFY);
SetLength(Textures, Length(Textures)+1);
// cîçäàåì êàäðû àíèì. òåêñòóðû èç êàðòèíîê
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);
WAD.Free();
Exit;
end;
+
WAD.Free();
// Çàãðóçêà êàðòû:
gDoorMap := nil;
gLiftMap := nil;
+
+ PanelByID := nil;
end;
procedure g_Map_Update();
///// /////
end;
+function g_Map_PanelForPID(PanelID: Integer; var PanelArrayID: Integer): PPanel;
+var
+ Arr: TPanelArray;
+begin
+ Result := nil;
+ if (PanelID < 0) or (PanelID > High(PanelByID)) then Exit;
+ Arr := PanelByID[PanelID].PWhere^;
+ PanelArrayID := PanelByID[PanelID].PArrID;
+ Result := Addr(Arr[PanelByID[PanelID].PArrID]);
+end;
+
end.