diff --git a/src/game/g_grid.pas b/src/game/g_grid.pas
index 2e7105e7729190fbe6e1062c834034beaa43de47..b1b157f8d3c685b3b65d457ed5620051d2bbb4dc 100644 (file)
--- a/src/game/g_grid.pas
+++ b/src/game/g_grid.pas
for idx := 0 to High(mCells) do
begin
mCells[idx].bodies[0] := -1;
+ mCells[idx].bodies[GridCellBucketSize-1] := -1; // "has free room" flag
mCells[idx].next := idx+1;
end;
mCells[High(mCells)].next := -1; // last cell
var
g, f, cidx: Integer;
cc: PGridCell;
- //px: PBodyProxyRec;
begin
if (body < 0) or (body > High(mProxies)) or not assigned(cb) then exit;
for g := 0 to High(mGrid) do
while (cidx <> -1) do
begin
cc := @mCells[cidx];
- for f := 0 to High(TGridCell.bodies) do
+ for f := 0 to GridCellBucketSize-1 do
begin
if (cc.bodies[f] = -1) then break;
if (cc.bodies[f] = body) then cb((g mod mWidth)*mTileSize+mMinX, (g div mWidth)*mTileSize+mMinY);
- //px := @mProxies[cc.bodies[f]];
end;
// next cell
cidx := cc.next;
while (cidx <> -1) do
begin
cc := @mCells[cidx];
- for f := 0 to High(TGridCell.bodies) do
+ for f := 0 to GridCellBucketSize-1 do
begin
if (cc.bodies[f] = -1) then break;
if cb(mProxies[cc.bodies[f]].mObj, mProxies[cc.bodies[f]].mTag) then begin result := mProxies[cc.bodies[f]].mObj; exit; end;
for idx := mFreeCell to High(mCells) do
begin
mCells[idx].bodies[0] := -1;
- mCells[idx].bodies[High(TGridCell.bodies)] := -1; // 'has free room' flag
+ mCells[idx].bodies[GridCellBucketSize-1] := -1; // 'has free room' flag
mCells[idx].next := idx+1;
end;
mCells[High(mCells)].next := -1; // last cell
pc := @mCells[result];
mFreeCell := pc.next;
pc.next := -1;
- //pc.bodies[0] := -1;
Inc(mUsedCells);
//e_WriteLog(Format('grid: allocated new cell #%d (total: %d)', [result, mUsedCells]), MSG_NOTIFY);
end;
with mCells[idx] do
begin
bodies[0] := -1;
- bodies[High(TGridCell.bodies)] := -1; // 'has free room' flag
+ bodies[GridCellBucketSize-1] := -1; // 'has free room' flag
next := mFreeCell;
end;
mFreeCell := idx;
if (pc <> -1) then
begin
pi := @mCells[pc];
- if (pi.bodies[High(TGridCell.bodies)] = -1) then
+ // check "has room" flag
+ if (pi.bodies[GridCellBucketSize-1] = -1) then
begin
// can add here
- for f := 0 to High(TGridCell.bodies) do
+ for f := 0 to GridCellBucketSize-1 do
begin
if (pi.bodies[f] = -1) then
begin
pi.bodies[f] := bodyId;
- if (f+1 < Length(TGridCell.bodies)) then pi.bodies[f+1] := -1;
+ if (f+1 < GridCellBucketSize) then pi.bodies[f+1] := -1;
exit;
end;
end;
while (cidx <> -1) do
begin
pc := @mCells[cidx];
- for f := 0 to High(TGridCell.bodies) do
+ for f := 0 to GridCellBucketSize-1 do
begin
if (pc.bodies[f] = bodyId) then
begin
exit;
end;
// remove element from bucket
- for c := f to High(TGridCell.bodies)-1 do
+ for c := f to GridCellBucketSize-2 do
begin
pc.bodies[c] := pc.bodies[c+1];
if (pc.bodies[c] = -1) then break;
end;
- pc.bodies[High(TGridCell.bodies)] := -1; // "has free room" flag
+ pc.bodies[GridCellBucketSize-1] := -1; // "has free room" flag
exit;
end;
end;
end;
end;
-// absolutely not tested
procedure TBodyGridBase.removeInternal (body: TBodyProxyId);
var
px: PBodyProxyRec;
while (curci <> -1) do
begin
cc := @mCells[curci];
- for f := 0 to High(TGridCell.bodies) do
+ for f := 0 to GridCellBucketSize-1 do
begin
if (cc.bodies[f] = -1) then break;
px := @mProxies[cc.bodies[f]];
while (curci <> -1) do
begin
cc := @mCells[curci];
- for f := 0 to High(TGridCell.bodies) do
+ for f := 0 to GridCellBucketSize-1 do
begin
if (cc.bodies[f] = -1) then break;
px := @mProxies[cc.bodies[f]];
while (curci <> -1) do
begin
cc := @mCells[curci];
- for f := 0 to High(TGridCell.bodies) do
+ for f := 0 to GridCellBucketSize-1 do
begin
if (cc.bodies[f] = -1) then break;
px := @mProxies[cc.bodies[f]];
while (curci <> -1) do
begin
cc := @mCells[curci];
- for f := 0 to High(TGridCell.bodies) do
+ for f := 0 to GridCellBucketSize-1 do
begin
if (cc.bodies[f] = -1) then break;
px := @mProxies[cc.bodies[f]];