diff --git a/src/game/g_map.pas b/src/game/g_map.pas
index d3ac7e017585a2e93fa9ef1c0ecdeec92926f734..6b343b325fa8913fa7f3cae31a27e42418be4659 100644 (file)
--- a/src/game/g_map.pas
+++ b/src/game/g_map.pas
procedure g_Map_Free();
procedure g_Map_Update();
-// build "potentially visible panels" set, so we can avoid looping over all level panels again and again
-procedure g_Map_BuildPVP (minx, miny, maxx, maxy: Integer);
-procedure g_Map_ResetPVP ();
-// do not call this without calling `g_Map_BuildPVP()` or `g_Map_ResetPVP()` first!
procedure g_Map_DrawPanels(x0, y0, wdt, hgt: Integer; PanelType: Word);
procedure g_Map_DrawBack(dx, dy: Integer);
procedure g_Map_SaveState(Var Mem: TBinMemoryWriter);
procedure g_Map_LoadState(Var Mem: TBinMemoryReader);
-// build "possibly lit panels" index, so we can avoid looping over all level panels again and again
-function g_Map_BuildPLP (ltminx, ltminy, ltmaxx, ltmaxy: Integer): Boolean; // returns `false` if no patels lit
procedure g_Map_DrawPanelShadowVolumes(lightX: Integer; lightY: Integer; radius: Integer);
const
gWADHash: TMD5Digest;
BackID: DWORD = DWORD(-1);
gExternalResources: TStringList;
- gMapGrid: TBodyGrid = nil;
implementation
MUSIC_SIGNATURE = $4953554D; // 'MUSI'
FLAG_SIGNATURE = $47414C46; // 'FLAG'
+
+function panelTypeToTag (panelType: Word): Integer;
+begin
+ case panelType of
+ PANEL_WALL, PANEL_OPENDOOR, PANEL_CLOSEDOOR: result := 0; // gWalls
+ PANEL_BACK: result := 1; // gRenderBackgrounds
+ PANEL_FORE: result := 2; // gRenderForegrounds
+ PANEL_WATER: result := 3; // gWater
+ PANEL_ACID1: result := 4; // gAcid1
+ PANEL_ACID2: result := 5; // gAcid2
+ PANEL_STEP: result := 6; // gSteps
+ PANEL_LIFTUP, PANEL_LIFTDOWN, PANEL_LIFTLEFT, PANEL_LIFTRIGHT: result := 7; // gLifts -- this is for all lifts
+ PANEL_BLOCKMON: result := 8; // gBlockMon -- this is for all blockmons
+ else result := -1;
+ end;
+end;
+
+
type
TPanelID = record
PWhere: ^TPanelArray;
RespawnPoints: Array of TRespawnPoint;
FlagPoints: Array [FLAG_RED..FLAG_BLUE] of PFlagPoint;
//DOMFlagPoints: Array of TFlagPoint;
+ gMapGrid: TBodyGrid = nil;
function g_Map_IsSpecialTexture(Texture: String): Boolean;
addResToExternalResList(mapHeader.SkyName);
end;
+procedure mapCreateGrid ();
+var
+ mapX0: Integer = $3fffffff;
+ mapY0: Integer = $3fffffff;
+ mapX1: Integer = -$3fffffff;
+ mapY1: Integer = -$3fffffff;
+
+ procedure fixMinMax (var panels: TPanelArray);
+ var
+ idx: Integer;
+ begin
+ for idx := 0 to High(panels) do
+ begin
+ if (panels[idx].Width < 1) or (panels[idx].Height < 1) then continue;
+ if mapX0 > panels[idx].X then mapX0 := panels[idx].X;
+ if mapY0 > panels[idx].Y then mapY0 := panels[idx].Y;
+ if mapX1 < panels[idx].X+panels[idx].Width-1 then mapX1 := panels[idx].X+panels[idx].Width-1;
+ if mapY1 < panels[idx].Y+panels[idx].Height-1 then mapY1 := panels[idx].Y+panels[idx].Height-1;
+ end;
+ end;
+
+ procedure addPanelsToGrid (var panels: TPanelArray; tag: Integer);
+ var
+ idx: Integer;
+ begin
+ tag := panelTypeToTag(tag);
+ for idx := High(panels) downto 0 do
+ begin
+ gMapGrid.insertBody(panels[idx], panels[idx].X, panels[idx].Y, panels[idx].Width, panels[idx].Height, tag);
+ end;
+ end;
+
+begin
+ gMapGrid.Free();
+ gMapGrid := nil;
+
+ fixMinMax(gWalls);
+ fixMinMax(gRenderBackgrounds);
+ fixMinMax(gRenderForegrounds);
+ fixMinMax(gWater);
+ fixMinMax(gAcid1);
+ fixMinMax(gAcid2);
+ fixMinMax(gSteps);
+ fixMinMax(gLifts);
+ fixMinMax(gBlockMon);
+
+ if (mapX0 < 0) or (mapY0 < 0) then
+ begin
+ e_WriteLog(Format('funny map dimensions: (%d,%d)-(%d,%d)', [mapX0, mapY0, mapX1, mapY1]), MSG_WARNING);
+ //raise Exception.Create('we are fucked');
+ end;
+
+ gMapGrid := TBodyGrid.Create(mapX0, mapY0, mapX1-mapX0+1, mapY1-mapY0+1);
+
+ addPanelsToGrid(gWalls, PANEL_WALL); // and PANEL_CLOSEDOOR
+ addPanelsToGrid(gRenderBackgrounds, PANEL_BACK);
+ addPanelsToGrid(gRenderForegrounds, PANEL_FORE);
+ addPanelsToGrid(gWater, PANEL_WATER);
+ addPanelsToGrid(gAcid1, PANEL_ACID1);
+ addPanelsToGrid(gAcid2, PANEL_ACID2);
+ addPanelsToGrid(gSteps, PANEL_STEP);
+ addPanelsToGrid(gLifts, PANEL_LIFTUP); // it doesn't matter which LIFT type is used here
+ addPanelsToGrid(gBlockMon, PANEL_BLOCKMON);
+
+ gMapGrid.dumpStats();
+end;
+
function g_Map_Load(Res: String): Boolean;
const
DefaultMusRes = 'Standart.wad:STDMUS\MUS1';
ok, isAnim, trigRef: Boolean;
CurTex, ntn: Integer;
- mapX0: Integer = $3fffffff;
- mapY0: Integer = $3fffffff;
- mapX1: Integer = -$3fffffff;
- mapY1: Integer = -$3fffffff;
-
- procedure fixMinMax (var panels: TPanelArray);
- var
- idx: Integer;
- begin
- for idx := 0 to High(panels) do
- begin
- if (panels[idx].Width < 1) or (panels[idx].Height < 1) then continue;
- if mapX0 > panels[idx].X then mapX0 := panels[idx].X;
- if mapY0 > panels[idx].Y then mapY0 := panels[idx].Y;
- if mapX1 < panels[idx].X+panels[idx].Width-1 then mapX1 := panels[idx].X+panels[idx].Width-1;
- if mapY1 < panels[idx].Y+panels[idx].Height-1 then mapY1 := panels[idx].Y+panels[idx].Height-1;
- end;
- end;
-
- procedure addPanelsToGrid (var panels: TPanelArray; tag: Integer);
- var
- idx: Integer;
- begin
- for idx := 0 to High(panels) do
- begin
- gMapGrid.insertBody(panels[idx], panels[idx].X, panels[idx].Y, panels[idx].Width, panels[idx].Height, tag);
- end;
- end;
-
begin
gMapGrid.Free();
gMapGrid := nil;
end;
e_WriteLog('Creating map grid', MSG_NOTIFY);
-
- fixMinMax(gWalls);
- fixMinMax(gRenderBackgrounds);
- fixMinMax(gRenderForegrounds);
- fixMinMax(gWater);
- fixMinMax(gAcid1);
- fixMinMax(gAcid2);
- fixMinMax(gSteps);
-
- gMapGrid := TBodyGrid.Create(mapX1+1, mapY1+1);
-
- addPanelsToGrid(gWalls, PANEL_WALL); // and PANEL_CLOSEDOOR
- addPanelsToGrid(gRenderBackgrounds, PANEL_BACK);
- addPanelsToGrid(gRenderForegrounds, PANEL_FORE);
- addPanelsToGrid(gWater, PANEL_WATER);
- addPanelsToGrid(gAcid1, PANEL_ACID1);
- addPanelsToGrid(gAcid2, PANEL_ACID2);
- addPanelsToGrid(gSteps, PANEL_STEP);
-
- gMapGrid.dumpStats();
+ mapCreateGrid();
e_WriteLog('Done loading map.', MSG_NOTIFY);
Result := True;
end;
-var
- pvpset: array of PPanel = nil; // potentially lit panels
- pvpb, pvpe: array [0..7] of Integer; // start/end (inclusive) of the correspoinding type panels in pvpset
- pvpcount: Integer = -1; // to avoid constant reallocations
-
-function pvpType (panelType: Word): Integer;
-begin
- case panelType of
- PANEL_WALL, PANEL_CLOSEDOOR: result := 0; // gWalls
- PANEL_BACK: result := 1; // gRenderBackgrounds
- PANEL_FORE: result := 2; // gRenderForegrounds
- PANEL_WATER: result := 3; // gWater
- PANEL_ACID1: result := 4; // gAcid1
- PANEL_ACID2: result := 5; // gAcid2
- PANEL_STEP: result := 6; // gSteps
- else result := -1;
- end;
-end;
-
-procedure g_Map_ResetPVP ();
-begin
- pvpcount := -1; // special
-end;
-
-procedure g_Map_BuildPVP (minx, miny, maxx, maxy: Integer);
-var
- idx: Integer;
- tpc: Integer;
-
- procedure checkPanels (var panels: TPanelArray; stp: Integer);
- var
- idx, x, y, w, h: Integer;
- begin
- if panels = nil then exit;
- tpc := tpc+Length(panels);
- if (stp < 0) or (stp > 6) then exit;
- pvpb[stp] := pvpcount;
- for idx := 0 to High(panels) do
- begin
- w := panels[idx].Width;
- h := panels[idx].Height;
- if (w < 1) or (h < 1) then continue;
- x := panels[idx].X;
- y := panels[idx].Y;
- if (x > maxx) or (y > maxy) then continue;
- if (x+w <= minx) or (y+h <= miny) then continue;
- if pvpcount = length(pvpset) then SetLength(pvpset, pvpcount+32768);
- pvpset[pvpcount] := @panels[idx];
- Inc(pvpcount);
- end;
- pvpe[stp] := pvpcount-1;
- end;
-
-begin
- //e_WriteLog(Format('visible rect: (%d,%d)-(%d,%d)', [minx, miny, maxx, maxy]), MSG_NOTIFY);
- pvpcount := 0;
- for idx := 0 to High(pvpb) do begin pvpb[idx] := 0; pvpe[idx] := -1; end;
- tpc := 0;
- checkPanels(gWalls, 0);
- checkPanels(gRenderBackgrounds, 1);
- checkPanels(gRenderForegrounds, 2);
- checkPanels(gWater, 3);
- checkPanels(gAcid1, 4);
- checkPanels(gAcid2, 5);
- checkPanels(gSteps, 6);
- //e_WriteLog(Format('total panels: %d; visible panels: %d', [tpc, pvpcount]), MSG_NOTIFY);
-end;
-
-procedure g_Map_DrawPanelsOld(x0, y0, wdt, hgt: Integer; PanelType: Word);
+procedure g_Map_DrawPanelsOld(PanelType: Word);
procedure DrawPanels (stp: Integer; var panels: TPanelArray; drawDoors: Boolean=False);
var
begin
if (panels <> nil) and (stp >= 0) and (stp <= 6) then
begin
- if pvpcount < 0 then
- begin
- // alas, no visible set
- for idx := 0 to High(panels) do
- begin
- if not (drawDoors xor panels[idx].Door) then panels[idx].Draw();
- end;
- end
- else
- begin
- // wow, use visible set
- if pvpb[stp] <= pvpe[stp] then
- begin
- for idx := pvpb[stp] to pvpe[stp] do
- begin
- if not (drawDoors xor pvpset[idx].Door) then pvpset[idx].Draw();
- end;
- end;
- end;
- end;
- end;
-
- procedure dumpPanels (stp: Integer; var panels: TPanelArray; drawDoors: Boolean=False);
- var
- idx: Integer;
- begin
- if (panels <> nil) and (stp >= 0) and (stp <= 6) then
- begin
- if pvpcount < 0 then
- begin
- // alas, no visible set
- for idx := 0 to High(panels) do
- begin
- if not (drawDoors xor panels[idx].Door) then
- begin
- e_WriteLog(Format(' body hit: (%d,%d)-(%dx%d)', [panels[idx].X, panels[idx].Y, panels[idx].Width, panels[idx].Height]), MSG_NOTIFY);
- end;
- end;
- end
- else
- begin
- // wow, use visible set
- if pvpb[stp] <= pvpe[stp] then
- begin
- for idx := pvpb[stp] to pvpe[stp] do
- begin
- if not (drawDoors xor pvpset[idx].Door) then
- begin
- e_WriteLog(Format(' body hit: (%d,%d)-(%dx%d)', [pvpset[idx].X, pvpset[idx].Y, pvpset[idx].Width, pvpset[idx].Height]), MSG_NOTIFY);
- end;
- end;
- end;
- end;
- end;
- end;
-
- function qq (obj: TObject; tag: Integer): Boolean;
- var
- pan: TPanel;
- begin
- result := false; // don't stop, ever
-
- //e_WriteLog(Format(' *body: tag:%d; qtag:%d', [tag, PanelType]), MSG_NOTIFY);
-
- if obj = nil then
- begin
- e_WriteLog(Format(' !bodyFUUUUU0: tag:%d; qtag:%d', [tag, PanelType]), MSG_NOTIFY);
- end;
- if not (obj is TPanel) then
- begin
- e_WriteLog(Format(' !bodyFUUUUU1: tag:%d; qtag:%d', [tag, PanelType]), MSG_NOTIFY);
- exit;
- end;
- //pan := (obj as TPanel);
- //e_WriteLog(Format(' !body: (%d,%d)-(%dx%d) tag:%d; qtag:%d', [pan.X, pan.Y, pan.Width, pan.Height, tag, PanelType]), MSG_NOTIFY);
-
- if (tag = PANEL_WALL) then
- begin
- if (PanelType = PANEL_WALL) then
- begin
- pan := (obj as TPanel);
- if not pan.Door then
- begin
- //e_WriteLog(Format(' body hit: (%d,%d)-(%dx%d)', [pan.X, pan.Y, pan.Width, pan.Height]), MSG_NOTIFY);
- pan.Draw();
- end;
- end
- else if (PanelType = PANEL_CLOSEDOOR) then
- begin
- pan := (obj as TPanel);
- if pan.Door then
- begin
- //e_WriteLog(Format(' body hit: (%d,%d)-(%dx%d)', [pan.X, pan.Y, pan.Width, pan.Height]), MSG_NOTIFY);
- pan.Draw();
- end;
- end
- end
- else if (PanelType = tag) then
- begin
- pan := (obj as TPanel);
- if not pan.Door then
+ // alas, no visible set
+ for idx := 0 to High(panels) do
begin
- //e_WriteLog(Format(' body hit: (%d,%d)-(%dx%d)', [pan.X, pan.Y, pan.Width, pan.Height]), MSG_NOTIFY);
- pan.Draw();
+ if not (drawDoors xor panels[idx].Door) then panels[idx].Draw();
end;
end;
end;
begin
- //e_WriteLog(Format('QQQ: qtag:%d', [PanelType]), MSG_NOTIFY);
- gMapGrid.forEachInAABB(x0, y0, wdt, hgt, qq);
- (*
- case PanelType of
- PANEL_WALL: dumpPanels(0, gWalls);
- PANEL_CLOSEDOOR: dumpPanels(0, gWalls, True);
- PANEL_BACK: dumpPanels(1, gRenderBackgrounds);
- PANEL_FORE: dumpPanels(2, gRenderForegrounds);
- PANEL_WATER: dumpPanels(3, gWater);
- PANEL_ACID1: dumpPanels(4, gAcid1);
- PANEL_ACID2: dumpPanels(5, gAcid2);
- PANEL_STEP: dumpPanels(6, gSteps);
- end;
- *)
-
- (*
case PanelType of
PANEL_WALL: DrawPanels(0, gWalls);
PANEL_CLOSEDOOR: DrawPanels(0, gWalls, True);
PANEL_ACID2: DrawPanels(5, gAcid2);
PANEL_STEP: DrawPanels(6, gSteps);
end;
- *)
end;
procedure g_Map_DrawPanels(x0, y0, wdt, hgt: Integer; PanelType: Word);
+var
+ ptag: Integer;
function qq (obj: TObject; tag: Integer): Boolean;
var
pan: TPanel;
begin
result := false; // don't stop, ever
-
+ if (tag <> ptag) then exit;
//e_WriteLog(Format(' *body: tag:%d; qtag:%d', [tag, PanelType]), MSG_NOTIFY);
- if obj = nil then
- begin
- e_WriteLog(Format(' !bodyFUUUUU0: tag:%d; qtag:%d', [tag, PanelType]), MSG_NOTIFY);
- end;
- if not (obj is TPanel) then
- begin
- e_WriteLog(Format(' !bodyFUUUUU1: tag:%d; qtag:%d', [tag, PanelType]), MSG_NOTIFY);
- exit;
- end;
- //pan := (obj as TPanel);
- //e_WriteLog(Format(' !body: (%d,%d)-(%dx%d) tag:%d; qtag:%d', [pan.X, pan.Y, pan.Width, pan.Height, tag, PanelType]), MSG_NOTIFY);
+ if obj = nil then begin e_WriteLog(Format(' !bodyFUUUUU0: tag:%d; qtag:%d', [tag, PanelType]), MSG_NOTIFY); exit; end;
+ if not (obj is TPanel) then begin e_WriteLog(Format(' !bodyFUUUUU1: tag:%d; qtag:%d', [tag, PanelType]), MSG_NOTIFY); exit; end;
+ //pan := (obj as TPanel);
+ //e_WriteLog(Format(' !body: (%d,%d)-(%dx%d) tag:%d; qtag:%d', [pan.X, pan.Y, pan.Width, pan.Height, tag, PanelType]), MSG_NOTIFY);
+
+ pan := (obj as TPanel);
+ if (PanelType = PANEL_CLOSEDOOR) then begin if not pan.Door then exit; end else begin if pan.Door then exit; end;
+ //e_WriteLog(Format(' body hit: (%d,%d)-(%dx%d) tag: %d; qtag:%d', [pan.X, pan.Y, pan.Width, pan.Height, tag, PanelType]), MSG_NOTIFY);
+ dplAddPanel(pan);
+ end;
- if (tag = PANEL_WALL) then
+ procedure DrawPanels (stp: Integer; var panels: TPanelArray; drawDoors: Boolean=False);
+ var
+ idx: Integer;
+ pan: TPanel;
+ begin
+ if (panels <> nil) and (stp >= 0) and (stp <= 6) then
begin
- if (PanelType = PANEL_WALL) then
- begin
- pan := (obj as TPanel);
- if not pan.Door then
- begin
- //e_WriteLog(Format(' body hit: (%d,%d)-(%dx%d)', [pan.X, pan.Y, pan.Width, pan.Height]), MSG_NOTIFY);
- dplAddPanel(pan);
- end;
- end
- else if (PanelType = PANEL_CLOSEDOOR) then
+ // alas, no visible set
+ for idx := 0 to High(panels) do
begin
- pan := (obj as TPanel);
- if pan.Door then
+ if not (drawDoors xor panels[idx].Door) then
begin
- //e_WriteLog(Format(' body hit: (%d,%d)-(%dx%d)', [pan.X, pan.Y, pan.Width, pan.Height]), MSG_NOTIFY);
- dplAddPanel(pan);
+ pan := panels[idx];
+ if (pan.Width < 1) or (pan.Height < 1) then continue;
+ if (pan.X+pan.Width <= x0) or (pan.Y+pan.Height <= y0) then continue;
+ if (pan.X >= x0+wdt) or (pan.Y >= y0+hgt) then continue;
+ e_WriteLog(Format(' *body hit: (%d,%d)-(%dx%d) tag: %d; qtag:%d', [pan.X, pan.Y, pan.Width, pan.Height, PanelType, PanelType]), MSG_NOTIFY);
end;
- end
- end
- else if (PanelType = tag) then
- begin
- pan := (obj as TPanel);
- if not pan.Door then
- begin
- //e_WriteLog(Format(' body hit: (%d,%d)-(%dx%d)', [pan.X, pan.Y, pan.Width, pan.Height]), MSG_NOTIFY);
- dplAddPanel(pan);
end;
end;
end;
begin
- //e_WriteLog(Format('QQQ: qtag:%d', [PanelType]), MSG_NOTIFY);
+ //g_Map_DrawPanelsOld(PanelType); exit;
+ //e_WriteLog('==================', MSG_NOTIFY);
+ //e_WriteLog(Format('***QQQ: qtag:%d', [PanelType]), MSG_NOTIFY);
dplClear();
+ ptag := panelTypeToTag(PanelType);
gMapGrid.forEachInAABB(x0, y0, wdt, hgt, qq);
+
+ // debug
+ {
+ e_WriteLog(Format('+++QQQ: qtag:%d', [PanelType]), MSG_NOTIFY);
+ case PanelType of
+ PANEL_WALL: DrawPanels(0, gWalls);
+ PANEL_CLOSEDOOR: DrawPanels(0, gWalls, True);
+ PANEL_BACK: DrawPanels(1, gRenderBackgrounds);
+ PANEL_FORE: DrawPanels(2, gRenderForegrounds);
+ PANEL_WATER: DrawPanels(3, gWater);
+ PANEL_ACID1: DrawPanels(4, gAcid1);
+ PANEL_ACID2: DrawPanels(5, gAcid2);
+ PANEL_STEP: DrawPanels(6, gSteps);
+ end;
+ e_WriteLog('==================', MSG_NOTIFY);
+ }
+
// sort and draw the list (we need to sort it, or rendering is fucked)
while gDrawPanelList.count > 0 do
begin
end;
end;
-var
- plpset: array of Integer = nil; // potentially lit panels
- plpcount: Integer; // to avoid constant reallocations
-
-function g_Map_BuildPLP (ltminx, ltminy, ltmaxx, ltmaxy: Integer): Boolean;
-var
- idx: Integer;
- panels: TPanelArray;
-begin
- panels := gWalls;
- plpcount := 0;
- if (ltminx < ltmaxx) and (ltminy < ltmaxy) then
- begin
- if panels <> nil then
- begin
- for idx := 0 to High(panels) do
- begin
- if (panels[idx].Width < 1) or (panels[idx].Height < 1) then continue;
- if (panels[idx].X+panels[idx].Width <= ltminx) then continue;
- if (panels[idx].Y+panels[idx].Height <= ltminy) then continue;
- if (panels[idx].X > ltmaxx) then continue;
- if (panels[idx].Y > ltmaxy) then continue;
- if plpcount = length(plpset) then SetLength(plpset, plpcount+32768);
- plpset[plpcount] := idx;
- Inc(plpcount);
- end;
- //e_WriteLog(Format('%d panels left out of %d', [plpcount, Length(panels)]), MSG_NOTIFY);
- end;
- end;
- result := (plpcount > 0);
-end;
procedure g_Map_DrawPanelShadowVolumes(lightX: Integer; lightY: Integer; radius: Integer);
-
- (* old
- procedure drawPanels (var panels: TPanelArray);
+ function qq (obj: TObject; tag: Integer): Boolean;
var
- a: Integer;
+ pan: TPanel;
begin
- if panels <> nil then
- begin
- for a := 0 to High(panels) do
- begin
- panels[a].DrawShadowVolume(lightX, lightY, radius);
- end;
- end;
+ result := false; // don't stop, ever
+ if (tag <> 0 {panelTypeToTag(PANEL_WALL)}) then exit; // only walls
+ pan := (obj as TPanel);
+ pan.DrawShadowVolume(lightX, lightY, radius);
end;
- *)
-var
- idx: Integer;
+
begin
- (*
- drawPanels(gWalls);
- //drawPanels(gRenderForegrounds);
- *)
- for idx := 0 to plpcount-1 do
- begin
- gWalls[plpset[idx]].DrawShadowVolume(lightX, lightY, radius);
- end;
+ gMapGrid.forEachInAABB(lightX-radius, lightY-radius, radius*2, radius*2, qq);
end;
+
procedure g_Map_DrawBack(dx, dy: Integer);
begin
if gDrawBackGround and (BackID <> DWORD(-1)) then
@@ -2256,7 +2069,7 @@ function g_Map_CollidePanel(X, Y: Integer; Width, Height: Word; PanelType: Word;
pan := (obj as TPanel);
a := pan.ArrIdx;
- if WordBool(PanelType and PANEL_WALL) and WordBool(tag and PANEL_WALL) then
+ if WordBool(PanelType and PANEL_WALL) and (tag = panelTypeToTag(PANEL_WALL)) then
begin
if gWalls[a].Enabled and g_Collide(X, Y, Width, Height, gWalls[a].X, gWalls[a].Y, gWalls[a].Width, gWalls[a].Height) then
begin
@@ -2265,7 +2078,7 @@ function g_Map_CollidePanel(X, Y: Integer; Width, Height: Word; PanelType: Word;
end;
end;
- if WordBool(PanelType and PANEL_WATER) and WordBool(tag and PANEL_WATER) then
+ if WordBool(PanelType and PANEL_WATER) and (tag = panelTypeToTag(PANEL_WATER)) then
begin
if g_Collide(X, Y, Width, Height, gWater[a].X, gWater[a].Y, gWater[a].Width, gWater[a].Height) then
begin
@@ -2274,7 +2087,7 @@ function g_Map_CollidePanel(X, Y: Integer; Width, Height: Word; PanelType: Word;
end;
end;
- if WordBool(PanelType and PANEL_ACID1) and WordBool(tag and PANEL_ACID1) then
+ if WordBool(PanelType and PANEL_ACID1) and (tag = panelTypeToTag(PANEL_ACID1)) then
begin
if g_Collide(X, Y, Width, Height, gAcid1[a].X, gAcid1[a].Y, gAcid1[a].Width, gAcid1[a].Height) then
begin
@@ -2283,7 +2096,7 @@ function g_Map_CollidePanel(X, Y: Integer; Width, Height: Word; PanelType: Word;
end;
end;
- if WordBool(PanelType and PANEL_ACID2) and WordBool(tag and PANEL_ACID2) then
+ if WordBool(PanelType and PANEL_ACID2) and (tag = panelTypeToTag(PANEL_ACID2)) then
begin
if g_Collide(X, Y, Width, Height, gAcid2[a].X, gAcid2[a].Y, gAcid2[a].Width, gAcid2[a].Height) then
begin
@@ -2292,7 +2105,7 @@ function g_Map_CollidePanel(X, Y: Integer; Width, Height: Word; PanelType: Word;
end;
end;
- if WordBool(PanelType and PANEL_STEP) and WordBool(tag and PANEL_STEP) then
+ if WordBool(PanelType and PANEL_STEP) and (tag = panelTypeToTag(PANEL_STEP)) then
begin
if g_Collide(X, Y, Width, Height, gSteps[a].X, gSteps[a].Y, gSteps[a].Width, gSteps[a].Height) then
begin
@@ -2300,50 +2113,33 @@ function g_Map_CollidePanel(X, Y: Integer; Width, Height: Word; PanelType: Word;
exit;
end;
end;
- end;
-var
- a, h: Integer;
-begin
- result := gMapGrid.forEachInAABB(X, Y, Width, Height, qq);
- if not result then
- begin
- if WordBool(PanelType and (PANEL_LIFTUP or PANEL_LIFTDOWN or PANEL_LIFTLEFT or PANEL_LIFTRIGHT)) and (gLifts <> nil) then
+ if WordBool(PanelType and (PANEL_LIFTUP or PANEL_LIFTDOWN or PANEL_LIFTLEFT or PANEL_LIFTRIGHT)) and (tag = panelTypeToTag(PANEL_LIFTUP)) then
begin
- h := High(gLifts);
- for a := 0 to h do
+ if ((WordBool(PanelType and (PANEL_LIFTUP)) and (gLifts[a].LiftType = 0)) or
+ (WordBool(PanelType and (PANEL_LIFTDOWN)) and (gLifts[a].LiftType = 1)) or
+ (WordBool(PanelType and (PANEL_LIFTLEFT)) and (gLifts[a].LiftType = 2)) or
+ (WordBool(PanelType and (PANEL_LIFTRIGHT)) and (gLifts[a].LiftType = 3))) and
+ g_Collide(X, Y, Width, Height, gLifts[a].X, gLifts[a].Y, gLifts[a].Width, gLifts[a].Height) then
begin
- if ((WordBool(PanelType and (PANEL_LIFTUP)) and (gLifts[a].LiftType = 0)) or
- (WordBool(PanelType and (PANEL_LIFTDOWN)) and (gLifts[a].LiftType = 1)) or
- (WordBool(PanelType and (PANEL_LIFTLEFT)) and (gLifts[a].LiftType = 2)) or
- (WordBool(PanelType and (PANEL_LIFTRIGHT)) and (gLifts[a].LiftType = 3))) and
- g_Collide(X, Y, Width, Height,
- gLifts[a].X, gLifts[a].Y,
- gLifts[a].Width, gLifts[a].Height) then
- begin
- Result := True;
- Exit;
- end;
+ result := true;
+ exit;
end;
end;
- if WordBool(PanelType and PANEL_BLOCKMON) and (gBlockMon <> nil) then
+ if WordBool(PanelType and PANEL_BLOCKMON)and (tag = panelTypeToTag(PANEL_BLOCKMON)) then
begin
- h := High(gBlockMon);
- for a := 0 to h do
+ if ((not b1x3) or ((gBlockMon[a].Width + gBlockMon[a].Height) >= 64)) and
+ g_Collide(X, Y, Width, Height, gBlockMon[a].X, gBlockMon[a].Y, gBlockMon[a].Width, gBlockMon[a].Height) then
begin
- if ( (not b1x3) or
- ((gBlockMon[a].Width + gBlockMon[a].Height) >= 64) ) and
- g_Collide(X, Y, Width, Height,
- gBlockMon[a].X, gBlockMon[a].Y,
- gBlockMon[a].Width, gBlockMon[a].Height) then
- begin
- Result := True;
- Exit;
- end;
+ result := True;
+ exit;
end;
end;
end;
+
+begin
+ result := gMapGrid.forEachInAABB(X, Y, Width, Height, qq);
end;
LoadPanelArray(gLifts);
///// /////
-// Îáíîâëÿåì êàðòó ñòîëêíîâåíèé:
+// Îáíîâëÿåì êàðòó ñòîëêíîâåíèé è ñåòêó:
g_GFX_Init();
+ mapCreateGrid();
///// Çàãðóæàåì ìóçûêó: /////
// Ñèãíàòóðà ìóçûêè: