X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_grid.pas;h=0fbbae7e8c03218958cce6f7662f8a9f61f3ccee;hb=9b63e74cbbb33cef5b1219c0afa82e43cfc40eeb;hp=56d8ecbc42bbebf2ac1c9075c588b5725f68f227;hpb=e27a7539a5cd40fb3a15c6daef0e18817b7c9bd8;p=d2df-sdl.git

diff --git a/src/game/g_grid.pas b/src/game/g_grid.pas
index 56d8ecb..0fbbae7 100644
--- a/src/game/g_grid.pas
+++ b/src/game/g_grid.pas
@@ -102,7 +102,7 @@ type
     procedure resizeBody (body: TBodyProxy; sx, sy: Integer);
     procedure moveResizeBody (body: TBodyProxy; dx, dy, sx, sy: Integer);
 
-    function forEachInAABB (x, y, w, h: Integer; cb: GridQueryCB): Boolean;
+    function forEachInAABB (x, y, w, h: Integer; cb: GridQueryCB; tagmask: Integer=-1): Boolean;
 
     function getProxyForBody (aObj: TObject; x, y, w, h: Integer): TBodyProxy;
 
@@ -401,7 +401,7 @@ begin
 end;
 
 
-function TBodyGrid.forEachInAABB (x, y, w, h: Integer; cb: GridQueryCB): Boolean;
+function TBodyGrid.forEachInAABB (x, y, w, h: Integer; cb: GridQueryCB; tagmask: Integer=-1): Boolean;
   function iterator (grida: Integer): Boolean;
   var
     idx: Integer;
@@ -414,7 +414,7 @@ function TBodyGrid.forEachInAABB (x, y, w, h: Integer; cb: GridQueryCB): Boolean
       if (mCells[idx].body <> -1) then
       begin
         px := @mProxies[mCells[idx].body];
-        if (px.mQueryMark <> mLastQuery) then
+        if (px.mQueryMark <> mLastQuery) and ((px.mTag and tagmask) <> 0) then
         begin
           //e_WriteLog(Format('  query #%d body hit: (%d,%d)-(%dx%d) tag:%d', [mLastQuery, mCells[idx].body.mX, mCells[idx].body.mY, mCells[idx].body.mWidth, mCells[idx].body.mHeight, mCells[idx].body.mTag]), MSG_NOTIFY);
           px.mQueryMark := mLastQuery;