summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 422b1ba)
raw | patch | inline | side by side (parent: 422b1ba)
| author | Ketmar Dark <ketmar@ketmar.no-ip.org> | |
| Wed, 16 Aug 2017 09:04:00 +0000 (12:04 +0300) | ||
| committer | Ketmar Dark <ketmar@ketmar.no-ip.org> | |
| Wed, 16 Aug 2017 09:27:46 +0000 (12:27 +0300) |
| src/game/g_grid.pas | patch | blob | history | |
| src/game/g_map.pas | patch | blob | history |
diff --git a/src/game/g_grid.pas b/src/game/g_grid.pas
index ffa05200c4d91b6957a186a6142ab6abe5d0ab1e..984d8e7e2c2b9025fe5a93c4274ad66372763d35 100644 (file)
--- a/src/game/g_grid.pas
+++ b/src/game/g_grid.pas
TBodyGrid = class(TObject)
private
mTileSize: Integer;
TBodyGrid = class(TObject)
private
mTileSize: Integer;
+ mMinX, mMinY: Integer; // so grids can start at any origin
mWidth, mHeight: Integer; // in tiles
mGrid: array of Integer; // mWidth*mHeight, index in mCells
mCells: array of TGridCell; // cell pool
mWidth, mHeight: Integer; // in tiles
mGrid: array of Integer; // mWidth*mHeight, index in mCells
mCells: array of TGridCell; // cell pool
function forGridRect (x, y, w, h: Integer; cb: GridInternalCB): Boolean;
public
function forGridRect (x, y, w, h: Integer; cb: GridInternalCB): Boolean;
public
- constructor Create (aPixWidth, aPixHeight: Integer; aTileSize: Integer=GridDefaultTileSize);
+ constructor Create (aMinPixX, aMinPixY, aPixWidth, aPixHeight: Integer; aTileSize: Integer=GridDefaultTileSize);
destructor Destroy (); override;
function insertBody (aObj: TObject; ax, ay, aWidth, aHeight: Integer; aTag: Integer=0): TBodyProxy;
destructor Destroy (); override;
function insertBody (aObj: TObject; ax, ay, aWidth, aHeight: Integer; aTag: Integer=0): TBodyProxy;
// ////////////////////////////////////////////////////////////////////////// //
// ////////////////////////////////////////////////////////////////////////// //
-constructor TBodyGrid.Create (aPixWidth, aPixHeight: Integer; aTileSize: Integer=GridDefaultTileSize);
+constructor TBodyGrid.Create (aMinPixX, aMinPixY, aPixWidth, aPixHeight: Integer; aTileSize: Integer=GridDefaultTileSize);
var
idx: Integer;
begin
var
idx: Integer;
begin
if aPixWidth < aTileSize then aPixWidth := aTileSize;
if aPixHeight < aTileSize then aPixHeight := aTileSize;
mTileSize := aTileSize;
if aPixWidth < aTileSize then aPixWidth := aTileSize;
if aPixHeight < aTileSize then aPixHeight := aTileSize;
mTileSize := aTileSize;
+ mMinX := aMinPixX;
+ mMinY := aMinPixY;
mWidth := (aPixWidth+aTileSize-1) div aTileSize;
mHeight := (aPixHeight+aTileSize-1) div aTileSize;
SetLength(mGrid, mWidth*mHeight);
mWidth := (aPixWidth+aTileSize-1) div aTileSize;
mHeight := (aPixHeight+aTileSize-1) div aTileSize;
SetLength(mGrid, mWidth*mHeight);
begin
result := false;
if (w < 1) or (h < 1) or not assigned(cb) then exit;
begin
result := false;
if (w < 1) or (h < 1) or not assigned(cb) then exit;
+ // fix coords
+ Dec(x, mMinX);
+ Dec(y, mMinY);
+ // go on
if (x+w <= 0) or (y+h <= 0) then exit;
if (x >= mWidth*mTileSize) or (y >= mHeight*mTileSize) then exit;
for gy := y div mTileSize to (y+h-1) div mTileSize do
if (x+w <= 0) or (y+h <= 0) then exit;
if (x >= mWidth*mTileSize) or (y >= mHeight*mTileSize) then exit;
for gy := y div mTileSize to (y+h-1) div mTileSize do
diff --git a/src/game/g_map.pas b/src/game/g_map.pas
index b2e35c0eb0b3044abc5308cd98354f286651a9c8..6b343b325fa8913fa7f3cae31a27e42418be4659 100644 (file)
--- a/src/game/g_map.pas
+++ b/src/game/g_map.pas
gWADHash: TMD5Digest;
BackID: DWORD = DWORD(-1);
gExternalResources: TStringList;
gWADHash: TMD5Digest;
BackID: DWORD = DWORD(-1);
gExternalResources: TStringList;
- gMapGrid: TBodyGrid = nil;
implementation
implementation
MUSIC_SIGNATURE = $4953554D; // 'MUSI'
FLAG_SIGNATURE = $47414C46; // 'FLAG'
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;
type
TPanelID = record
PWhere: ^TPanelArray;
RespawnPoints: Array of TRespawnPoint;
FlagPoints: Array [FLAG_RED..FLAG_BLUE] of PFlagPoint;
//DOMFlagPoints: Array of TFlagPoint;
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;
function g_Map_IsSpecialTexture(Texture: String): Boolean;
addResToExternalResList(mapHeader.SkyName);
end;
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';
function g_Map_Load(Res: String): Boolean;
const
DefaultMusRes = 'Standart.wad:STDMUS\MUS1';
ok, isAnim, trigRef: Boolean;
CurTex, ntn: Integer;
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 := 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;
begin
gMapGrid.Free();
gMapGrid := nil;
end;
e_WriteLog('Creating map grid', MSG_NOTIFY);
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;
e_WriteLog('Done loading map.', MSG_NOTIFY);
Result := True;
end;
end;
-{
-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_DrawPanelsOld(PanelType: Word);
procedure DrawPanels (stp: Integer; var panels: TPanelArray; drawDoors: Boolean=False);
procedure g_Map_DrawPanelsOld(PanelType: Word);
procedure DrawPanels (stp: Integer; var panels: TPanelArray; drawDoors: Boolean=False);
procedure g_Map_DrawPanels(x0, y0, wdt, hgt: Integer; PanelType: Word);
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
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);
//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);
- 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) tag: %d; qtag:%d', [pan.X, pan.Y, pan.Width, pan.Height, tag, PanelType]), MSG_NOTIFY);
- dplAddPanel(pan);
- 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) tag: %d; qtag:%d', [pan.X, pan.Y, pan.Width, pan.Height, tag, PanelType]), MSG_NOTIFY);
- dplAddPanel(pan);
- 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) tag: %d; qtag:%d', [pan.X, pan.Y, pan.Width, pan.Height, tag, PanelType]), MSG_NOTIFY);
- dplAddPanel(pan);
- end;
- end;
+ 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;
procedure DrawPanels (stp: Integer; var panels: TPanelArray; drawDoors: Boolean=False);
end;
procedure DrawPanels (stp: Integer; var panels: TPanelArray; drawDoors: Boolean=False);
//e_WriteLog('==================', MSG_NOTIFY);
//e_WriteLog(Format('***QQQ: qtag:%d', [PanelType]), MSG_NOTIFY);
dplClear();
//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
gMapGrid.forEachInAABB(x0, y0, wdt, hgt, qq);
// debug
@@ -1917,7 +1907,7 @@ procedure g_Map_DrawPanelShadowVolumes(lightX: Integer; lightY: Integer; radius:
pan: TPanel;
begin
result := false; // don't stop, ever
pan: TPanel;
begin
result := false; // don't stop, ever
- if (tag <> PANEL_WALL) then exit; // only walls
+ if (tag <> 0 {panelTypeToTag(PANEL_WALL)}) then exit; // only walls
pan := (obj as TPanel);
pan.DrawShadowVolume(lightX, lightY, radius);
end;
pan := (obj as TPanel);
pan.DrawShadowVolume(lightX, lightY, radius);
end;
@@ -2079,7 +2069,7 @@ function g_Map_CollidePanel(X, Y: Integer; Width, Height: Word; PanelType: Word;
pan := (obj as TPanel);
a := pan.ArrIdx;
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
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
@@ -2088,7 +2078,7 @@ function g_Map_CollidePanel(X, Y: Integer; Width, Height: Word; PanelType: Word;
end;
end;
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
begin
if g_Collide(X, Y, Width, Height, gWater[a].X, gWater[a].Y, gWater[a].Width, gWater[a].Height) then
begin
@@ -2097,7 +2087,7 @@ function g_Map_CollidePanel(X, Y: Integer; Width, Height: Word; PanelType: Word;
end;
end;
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
begin
if g_Collide(X, Y, Width, Height, gAcid1[a].X, gAcid1[a].Y, gAcid1[a].Width, gAcid1[a].Height) then
begin
@@ -2106,7 +2096,7 @@ function g_Map_CollidePanel(X, Y: Integer; Width, Height: Word; PanelType: Word;
end;
end;
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
begin
if g_Collide(X, Y, Width, Height, gAcid2[a].X, gAcid2[a].Y, gAcid2[a].Width, gAcid2[a].Height) then
begin
@@ -2115,7 +2105,7 @@ function g_Map_CollidePanel(X, Y: Integer; Width, Height: Word; PanelType: Word;
end;
end;
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
begin
if g_Collide(X, Y, Width, Height, gSteps[a].X, gSteps[a].Y, gSteps[a].Width, gSteps[a].Height) then
begin
@@ -2123,50 +2113,33 @@ function g_Map_CollidePanel(X, Y: Integer; Width, Height: Word; PanelType: Word;
exit;
end;
end;
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
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
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;
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
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
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;
end;
end;
end;
+
+begin
+ result := gMapGrid.forEachInAABB(X, Y, Width, Height, qq);
end;
end;
LoadPanelArray(gLifts);
///// /////
LoadPanelArray(gLifts);
///// /////
-// Îáíîâëÿåì êàðòó ñòîëêíîâåíèé:
+// Îáíîâëÿåì êàðòó ñòîëêíîâåíèé è ñåòêó:
g_GFX_Init();
g_GFX_Init();
+ mapCreateGrid();
///// Çàãðóæàåì ìóçûêó: /////
// Ñèãíàòóðà ìóçûêè:
///// Çàãðóæàåì ìóçûêó: /////
// Ñèãíàòóðà ìóçûêè: