diff --git a/src/game/g_map.pas b/src/game/g_map.pas
index 642beaade9c2576106db385248eef6d277819d09..4b197e3ec74bf4e2ddbec3750e4624798ab307ab 100644 (file)
--- a/src/game/g_map.pas
+++ b/src/game/g_map.pas
function g_Map_ParseMap (data: Pointer; dataLen: Integer): TDynRecord;
+
+function g_Map_MinX (): Integer; inline;
+function g_Map_MinY (): Integer; inline;
+function g_Map_MaxX (): Integer; inline;
+function g_Map_MaxY (): Integer; inline;
+
const
NNF_NO_NAME = 0;
NNF_NAME_BEFORE = 1;
GridTagLift = 1 shl 8; // gLifts
GridTagBlockMon = 1 shl 9; // gBlockMon
+ GridTagObstacle = (GridTagStep or GridTagWall or GridTagDoor);
+ GridTagLiquid = (GridTagAcid1 or GridTagAcid2 or GridTagWater);
+
GridDrawableMask = (GridTagBack or GridTagStep or GridTagWall or GridTagDoor or GridTagAcid1 or GridTagAcid2 or GridTagWater or GridTagFore);
end;
+// ////////////////////////////////////////////////////////////////////////// //
+function g_Map_MinX (): Integer; inline; begin if (mapGrid <> nil) then result := mapGrid.gridX0 else result := 0; end;
+function g_Map_MinY (): Integer; inline; begin if (mapGrid <> nil) then result := mapGrid.gridY0 else result := 0; end;
+function g_Map_MaxX (): Integer; inline; begin if (mapGrid <> nil) then result := mapGrid.gridX0+mapGrid.gridWidth-1 else result := 0; end;
+function g_Map_MaxY (): Integer; inline; begin if (mapGrid <> nil) then result := mapGrid.gridY0+mapGrid.gridHeight-1 else result := 0; end;
+
+
// ////////////////////////////////////////////////////////////////////////// //
var
dfmapdef: TDynMapDef = nil;
+
procedure loadMapDefinition ();
var
pr: TTextParser = nil;
WAD: TWADFile = nil;
begin
if (dfmapdef <> nil) then exit;
+
try
e_LogWritefln('parsing "mapdef.txt"...', []);
st := openDiskFileRO(DataDir+'mapdef.txt');
+ e_LogWritefln('found local "%smapdef.txt"', [DataDir]);
except
st := nil;
- e_LogWritefln('local "%smapdef.txt" not found', [DataDir]);
end;
+
if (st = nil) then
begin
WAD := TWADFile.Create();
end;
end;
- if (st = nil) then
- begin
- //raise Exception.Create('cannot open "mapdef.txt"');
- e_LogWritefln('using default "mapdef.txt"...', [], MSG_WARNING);
- pr := TStrTextParser.Create(defaultMapDef);
- end
- else
- begin
- pr := TFileTextParser.Create(st);
+ try
+ if (st = nil) then
+ begin
+ //raise Exception.Create('cannot open "mapdef.txt"');
+ e_LogWriteln('using default "mapdef.txt"...');
+ pr := TStrTextParser.Create(defaultMapDef);
+ end
+ else
+ begin
+ pr := TFileTextParser.Create(st);
+ end;
+ except on e: Exception do
+ begin
+ e_LogWritefln('something is VERY wrong here! -- ', [e.message]);
+ raise;
+ end;
end;
try
begin
result := nil;
if (dataLen < 4) then exit;
+
+ if (dfmapdef = nil) then writeln('need to load mapdef');
loadMapDefinition();
if (dfmapdef = nil) then raise Exception.Create('internal map loader error');
begin
// binary map
try
+ //e_LogWriteln('parsing binary map...');
result := dfmapdef.parseBinMap(wst);
except on e: Exception do
begin
// text map
pr := TFileTextParser.Create(wst);
try
+ //e_LogWriteln('parsing text map...');
result := dfmapdef.parseMap(pr);
except on e: Exception do
begin
end;
pr.Free(); // will free `wst`
end;
+ //e_LogWriteln('map parsed.');
end;
end
else
begin
- trigData := Trigger.trigRec.clone();
+ trigData := Trigger.trigRec.clone(nil);
end;
end;
mapReader := g_Map_ParseMap(Data, Len);
except
mapReader := nil;
+ FreeMem(Data);
+ exit;
end;
FreeMem(Data);
end;
begin
+ if g_dbgpan_mplat_step then g_dbgpan_mplat_active := true;
+
UpdatePanelArray(gWalls);
UpdatePanelArray(gRenderBackgrounds);
UpdatePanelArray(gRenderForegrounds);
UpdatePanelArray(gAcid2);
UpdatePanelArray(gSteps);
+ if g_dbgpan_mplat_step then begin g_dbgpan_mplat_step := false; g_dbgpan_mplat_active := false; end;
+
if gGameSettings.GameMode = GM_CTF then
begin
for a := FLAG_RED to FLAG_BLUE do
end;
end;
-procedure g_Map_SaveState(Var Mem: TBinMemoryWriter);
+
+procedure g_Map_SaveState (var Mem: TBinMemoryWriter);
var
dw: DWORD;
b: Byte;
str: String;
boo: Boolean;
- procedure SavePanelArray(var panels: TPanelArray);
+ procedure savePanels ();
var
PAMem: TBinMemoryWriter;
- i: Integer;
+ pan: TPanel;
begin
- // Ñîçäàåì íîâûé ñïèñîê ñîõðàíÿåìûõ ïàíåëåé:
- PAMem := TBinMemoryWriter.Create((Length(panels)+1) * 40);
+ // Ñîçäàåì íîâûé ñïèñîê ñîõðàíÿåìûõ ïàíåëåé
+ PAMem := TBinMemoryWriter.Create((Length(panByGUID)+1) * 40);
- i := 0;
- while i < Length(panels) do
+ for pan in panByGUID do
begin
- if true{panels[i].SaveIt} then
+ if true{pan.SaveIt} then
begin
- // ID ïàíåëè:
- PAMem.WriteInt(i);
- // Ñîõðàíÿåì ïàíåëü:
- panels[i].SaveState(PAMem);
+ // ID ïàíåëè
+ //PAMem.WriteInt(i);
+ // Ñîõðàíÿåì ïàíåëü
+ pan.SaveState(PAMem);
end;
- Inc(i);
end;
- // Ñîõðàíÿåì ýòîò ñïèñîê ïàíåëåé:
+ // Ñîõðàíÿåì ýòîò ñïèñîê ïàíåëåé
PAMem.SaveToMemory(Mem);
PAMem.Free();
end;
- procedure SaveFlag(flag: PFlag);
+ procedure SaveFlag (flag: PFlag);
begin
- // Ñèãíàòóðà ôëàãà:
+ // Ñèãíàòóðà ôëàãà
dw := FLAG_SIGNATURE; // 'FLAG'
Mem.WriteDWORD(dw);
- // Âðåìÿ ïåðåïîÿâëåíèÿ ôëàãà:
+ // Âðåìÿ ïåðåïîÿâëåíèÿ ôëàãà
Mem.WriteByte(flag^.RespawnType);
- // Ñîñòîÿíèå ôëàãà:
+ // Ñîñòîÿíèå ôëàãà
Mem.WriteByte(flag^.State);
- // Íàïðàâëåíèå ôëàãà:
- if flag^.Direction = D_LEFT then
- b := 1
- else // D_RIGHT
- b := 2;
+ // Íàïðàâëåíèå ôëàãà
+ if flag^.Direction = D_LEFT then b := 1 else b := 2; // D_RIGHT
Mem.WriteByte(b);
- // Îáúåêò ôëàãà:
+ // Îáúåêò ôëàãà
Obj_SaveState(@flag^.Obj, Mem);
end;
begin
Mem := TBinMemoryWriter.Create(1024 * 1024); // 1 MB
-///// Ñîõðàíÿåì ñïèñêè ïàíåëåé: /////
-// Ñîõðàíÿåì ïàíåëè ñòåí è äâåðåé:
- SavePanelArray(gWalls);
-// Ñîõðàíÿåì ïàíåëè ôîíà:
- SavePanelArray(gRenderBackgrounds);
-// Ñîõðàíÿåì ïàíåëè ïåðåäíåãî ïëàíà:
- SavePanelArray(gRenderForegrounds);
-// Ñîõðàíÿåì ïàíåëè âîäû:
- SavePanelArray(gWater);
-// Ñîõðàíÿåì ïàíåëè êèñëîòû-1:
- SavePanelArray(gAcid1);
-// Ñîõðàíÿåì ïàíåëè êèñëîòû-2:
- SavePanelArray(gAcid2);
-// Ñîõðàíÿåì ïàíåëè ñòóïåíåé:
- SavePanelArray(gSteps);
-// Ñîõðàíÿåì ïàíåëè ëèôòîâ:
- SavePanelArray(gLifts);
-///// /////
-
-///// Ñîõðàíÿåì ìóçûêó: /////
-// Ñèãíàòóðà ìóçûêè:
+ ///// Ñîõðàíÿåì ñïèñêè ïàíåëåé: /////
+ savePanels();
+ ///// /////
+
+ ///// Ñîõðàíÿåì ìóçûêó: /////
+ // Ñèãíàòóðà ìóçûêè:
dw := MUSIC_SIGNATURE; // 'MUSI'
Mem.WriteDWORD(dw);
-// Íàçâàíèå ìóçûêè:
+ // Íàçâàíèå ìóçûêè:
Assert(gMusic <> nil, 'g_Map_SaveState: gMusic = nil');
- if gMusic.NoMusic then
- str := ''
- else
- str := gMusic.Name;
+ if gMusic.NoMusic then str := '' else str := gMusic.Name;
Mem.WriteString(str, 64);
-// Ïîçèöèÿ ïðîèãðûâàíèÿ ìóçûêè:
+ // Ïîçèöèÿ ïðîèãðûâàíèÿ ìóçûêè
dw := gMusic.GetPosition();
Mem.WriteDWORD(dw);
-// Ñòîèò ëè ìóçûêà íà ñïåö-ïàóçå:
+ // Ñòîèò ëè ìóçûêà íà ñïåö-ïàóçå
boo := gMusic.SpecPause;
Mem.WriteBoolean(boo);
-///// /////
+ ///// /////
-///// Ñîõðàíÿåì êîëè÷åñòâî ìîíñòðîâ: /////
+ ///// Ñîõðàíÿåì êîëè÷åñòâî ìîíñòðîâ: /////
Mem.WriteInt(gTotalMonsters);
-///// /////
+ ///// /////
-//// Ñîõðàíÿåì ôëàãè, åñëè ýòî CTF: /////
+ //// Ñîõðàíÿåì ôëàãè, åñëè ýòî CTF: /////
if gGameSettings.GameMode = GM_CTF then
begin
- // Ôëàã Êðàñíîé êîìàíäû:
+ // Ôëàã Êðàñíîé êîìàíäû
SaveFlag(@gFlags[FLAG_RED]);
- // Ôëàã Ñèíåé êîìàíäû:
+ // Ôëàã Ñèíåé êîìàíäû
SaveFlag(@gFlags[FLAG_BLUE]);
end;
-///// /////
+ ///// /////
-///// Ñîõðàíÿåì êîëè÷åñòâî ïîáåä, åñëè ýòî TDM/CTF: /////
+ ///// Ñîõðàíÿåì êîëè÷åñòâî ïîáåä, åñëè ýòî TDM/CTF: /////
if gGameSettings.GameMode in [GM_TDM, GM_CTF] then
begin
- // Î÷êè Êðàñíîé êîìàíäû:
+ // Î÷êè Êðàñíîé êîìàíäû
Mem.WriteSmallInt(gTeamStat[TEAM_RED].Goals);
- // Î÷êè Ñèíåé êîìàíäû:
+ // Î÷êè Ñèíåé êîìàíäû
Mem.WriteSmallInt(gTeamStat[TEAM_BLUE].Goals);
end;
-///// /////
+ ///// /////
end;
-procedure g_Map_LoadState(Var Mem: TBinMemoryReader);
+
+procedure g_Map_LoadState (var Mem: TBinMemoryReader);
var
dw: DWORD;
b: Byte;
str: String;
boo: Boolean;
- procedure LoadPanelArray(var panels: TPanelArray);
+ procedure loadPanels ();
var
PAMem: TBinMemoryReader;
- i, id: Integer;
+ pan: TPanel;
begin
- // Çàãðóæàåì òåêóùèé ñïèñîê ïàíåëåé:
+ // Çàãðóæàåì òåêóùèé ñïèñîê ïàíåëåé
PAMem := TBinMemoryReader.Create();
PAMem.LoadFromMemory(Mem);
- for i := 0 to Length(panels)-1 do
+ for pan in panByGUID do
begin
- if true{panels[i].SaveIt} then
+ if true{pan.SaveIt} then
begin
- // ID ïàíåëè:
- PAMem.ReadInt(id);
- if id <> i then
- begin
- raise EBinSizeError.Create('g_Map_LoadState: LoadPanelArray: Wrong Panel ID');
- end;
- // Çàãðóæàåì ïàíåëü:
- panels[i].LoadState(PAMem);
- if (panels[i].arrIdx <> i) then raise Exception.Create('g_Map_LoadState: LoadPanelArray: Wrong Panel arrIdx');
- if (panels[i].proxyId >= 0) then mapGrid.proxyEnabled[panels[i].proxyId] := panels[i].Enabled;
+ // ID ïàíåëè:
+ //PAMem.ReadInt(id);
+ {
+ if id <> i then raise EBinSizeError.Create('g_Map_LoadState: LoadPanelArray: Wrong Panel ID');
+ }
+ // Çàãðóæàåì ïàíåëü
+ pan.LoadState(PAMem);
+ //if (panels[i].arrIdx <> i) then raise Exception.Create('g_Map_LoadState: LoadPanelArray: Wrong Panel arrIdx');
+ if (pan.proxyId >= 0) then mapGrid.proxyEnabled[pan.proxyId] := pan.Enabled;
end;
end;
- // Ýòîò ñïèñîê ïàíåëåé çàãðóæåí:
+ // Ýòîò ñïèñîê ïàíåëåé çàãðóæåí
PAMem.Free();
end;
procedure LoadFlag(flag: PFlag);
begin
- // Ñèãíàòóðà ôëàãà:
+ // Ñèãíàòóðà ôëàãà
Mem.ReadDWORD(dw);
- if dw <> FLAG_SIGNATURE then // 'FLAG'
- begin
- raise EBinSizeError.Create('g_Map_LoadState: LoadFlag: Wrong Flag Signature');
- end;
- // Âðåìÿ ïåðåïîÿâëåíèÿ ôëàãà:
+ // 'FLAG'
+ if dw <> FLAG_SIGNATURE then raise EBinSizeError.Create('g_Map_LoadState: LoadFlag: Wrong Flag Signature');
+ // Âðåìÿ ïåðåïîÿâëåíèÿ ôëàãà
Mem.ReadByte(flag^.RespawnType);
- // Ñîñòîÿíèå ôëàãà:
+ // Ñîñòîÿíèå ôëàãà
Mem.ReadByte(flag^.State);
- // Íàïðàâëåíèå ôëàãà:
+ // Íàïðàâëåíèå ôëàãà
Mem.ReadByte(b);
- if b = 1 then
- flag^.Direction := D_LEFT
- else // b = 2
- flag^.Direction := D_RIGHT;
- // Îáúåêò ôëàãà:
+ if b = 1 then flag^.Direction := D_LEFT else flag^.Direction := D_RIGHT; // b = 2
+ // Îáúåêò ôëàãà
Obj_LoadState(@flag^.Obj, Mem);
end;
begin
- if Mem = nil then
- Exit;
+ if Mem = nil then Exit;
+
+ ///// Çàãðóæàåì ñïèñêè ïàíåëåé: /////
+ loadPanels();
+ ///// /////
-///// Çàãðóæàåì ñïèñêè ïàíåëåé: /////
-// Çàãðóæàåì ïàíåëè ñòåí è äâåðåé:
- LoadPanelArray(gWalls);
-// Çàãðóæàåì ïàíåëè ôîíà:
- LoadPanelArray(gRenderBackgrounds);
-// Çàãðóæàåì ïàíåëè ïåðåäíåãî ïëàíà:
- LoadPanelArray(gRenderForegrounds);
-// Çàãðóæàåì ïàíåëè âîäû:
- LoadPanelArray(gWater);
-// Çàãðóæàåì ïàíåëè êèñëîòû-1:
- LoadPanelArray(gAcid1);
-// Çàãðóæàåì ïàíåëè êèñëîòû-2:
- LoadPanelArray(gAcid2);
-// Çàãðóæàåì ïàíåëè ñòóïåíåé:
- LoadPanelArray(gSteps);
-// Çàãðóæàåì ïàíåëè ëèôòîâ:
- LoadPanelArray(gLifts);
-///// /////
-
-// Îáíîâëÿåì êàðòó ñòîëêíîâåíèé è ñåòêó:
+ // Îáíîâëÿåì êàðòó ñòîëêíîâåíèé è ñåòêó
g_GFX_Init();
//mapCreateGrid();
-///// Çàãðóæàåì ìóçûêó: /////
-// Ñèãíàòóðà ìóçûêè:
+ ///// Çàãðóæàåì ìóçûêó: /////
+ // Ñèãíàòóðà ìóçûêè
Mem.ReadDWORD(dw);
- if dw <> MUSIC_SIGNATURE then // 'MUSI'
- begin
- raise EBinSizeError.Create('g_Map_LoadState: Wrong Music Signature');
- end;
-// Íàçâàíèå ìóçûêè:
+ // 'MUSI'
+ if dw <> MUSIC_SIGNATURE then raise EBinSizeError.Create('g_Map_LoadState: Wrong Music Signature');
+ // Íàçâàíèå ìóçûêè
Assert(gMusic <> nil, 'g_Map_LoadState: gMusic = nil');
Mem.ReadString(str);
-// Ïîçèöèÿ ïðîèãðûâàíèÿ ìóçûêè:
+ // Ïîçèöèÿ ïðîèãðûâàíèÿ ìóçûêè
Mem.ReadDWORD(dw);
-// Ñòîèò ëè ìóçûêà íà ñïåö-ïàóçå:
+ // Ñòîèò ëè ìóçûêà íà ñïåö-ïàóçå
Mem.ReadBoolean(boo);
-// Çàïóñêàåì ýòó ìóçûêó:
+ // Çàïóñêàåì ýòó ìóçûêó
gMusic.SetByName(str);
gMusic.SpecPause := boo;
gMusic.Play();
gMusic.Pause(True);
gMusic.SetPosition(dw);
-///// /////
+ ///// /////
-///// Çàãðóæàåì êîëè÷åñòâî ìîíñòðîâ: /////
+ ///// Çàãðóæàåì êîëè÷åñòâî ìîíñòðîâ: /////
Mem.ReadInt(gTotalMonsters);
-///// /////
+ ///// /////
-//// Çàãðóæàåì ôëàãè, åñëè ýòî CTF: /////
+ //// Çàãðóæàåì ôëàãè, åñëè ýòî CTF: /////
if gGameSettings.GameMode = GM_CTF then
begin
- // Ôëàã Êðàñíîé êîìàíäû:
+ // Ôëàã Êðàñíîé êîìàíäû
LoadFlag(@gFlags[FLAG_RED]);
- // Ôëàã Ñèíåé êîìàíäû:
+ // Ôëàã Ñèíåé êîìàíäû
LoadFlag(@gFlags[FLAG_BLUE]);
end;
-///// /////
+ ///// /////
-///// Çàãðóæàåì êîëè÷åñòâî ïîáåä, åñëè ýòî TDM/CTF: /////
+ ///// Çàãðóæàåì êîëè÷åñòâî ïîáåä, åñëè ýòî TDM/CTF: /////
if gGameSettings.GameMode in [GM_TDM, GM_CTF] then
begin
- // Î÷êè Êðàñíîé êîìàíäû:
+ // Î÷êè Êðàñíîé êîìàíäû
Mem.ReadSmallInt(gTeamStat[TEAM_RED].Goals);
- // Î÷êè Ñèíåé êîìàíäû:
+ // Î÷êè Ñèíåé êîìàíäû
Mem.ReadSmallInt(gTeamStat[TEAM_BLUE].Goals);
end;
-///// /////
+ ///// /////
end;