X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_grid.pas;h=2afca2f3c16c0db534a6ec68cb4bb665c200e186;hb=cb39caa8b879b70aa096476a2e919d4a298f1fa5;hp=2e7105e7729190fbe6e1062c834034beaa43de47;hpb=5599208111f3a6c4f303cb719a26e8e405e82a69;p=d2df-sdl.git

diff --git a/src/game/g_grid.pas b/src/game/g_grid.pas
index 2e7105e..2afca2f 100644
--- a/src/game/g_grid.pas
+++ b/src/game/g_grid.pas
@@ -17,6 +17,8 @@
 {$INCLUDE ../shared/a_modes.inc}
 {$IF DEFINED(D2F_DEBUG)}
   {.$DEFINE D2F_DEBUG_RAYTRACE}
+  {.$DEFINE D2F_DEBUG_XXQ}
+  {.$DEFINE D2F_DEBUG_MOVER}
 {$ENDIF}
 unit g_grid;
 
@@ -127,6 +129,8 @@ type
 
     // `false` if `body` is surely invalid
     function getBodyXY (body: TBodyProxyId; out rx, ry: Integer): Boolean; inline;
+    function getBodyWH (body: TBodyProxyId; out rw, rh: Integer): Boolean; inline;
+    function getBodyDims (body: TBodyProxyId; out rx, ry, rw, rh: Integer): Boolean; inline;
 
     //WARNING: don't modify grid while any query is in progress (no checks are made!)
     //         you can set enabled/disabled flag, tho (but iterator can still return objects disabled inside it)
@@ -135,19 +139,25 @@ type
 
     //WARNING: don't modify grid while any query is in progress (no checks are made!)
     //         you can set enabled/disabled flag, tho (but iterator can still return objects disabled inside it)
-    // no callback: return `true` on the first hit
-    function forEachAtPoint (x, y: Integer; cb: TGridQueryCB; tagmask: Integer=-1): ITP;
+    // no callback: return object on the first hit or nil
+    function forEachAtPoint (x, y: Integer; cb: TGridQueryCB; tagmask: Integer=-1; exittag: PInteger=nil): ITP;
 
     //WARNING: don't modify grid while any query is in progress (no checks are made!)
     //         you can set enabled/disabled flag, tho (but iterator can still return objects disabled inside it)
     // cb with `(nil)` will be called before processing new tile
-    // no callback: return `true` on the nearest hit
+    // no callback: return object of the nearest hit or nil
+    // if `inverted` is true, trace will register bodies *exluding* tagmask
+    //WARNING: don't change tags in callbacks here!
     function traceRay (const x0, y0, x1, y1: Integer; cb: TGridRayQueryCB; tagmask: Integer=-1): ITP; overload;
     function traceRay (out ex, ey: Integer; const ax0, ay0, ax1, ay1: Integer; cb: TGridRayQueryCB; tagmask: Integer=-1): ITP;
 
+    //function traceRayWhileIn (const x0, y0, x1, y1: Integer; tagmask: Integer=-1): ITP; overload;
+    //function traceRayWhileIn (out ex, ey: Integer; const ax0, ay0, ax1, ay1: Integer; tagmask: Integer=-1): ITP;
+
     //WARNING: don't modify grid while any query is in progress (no checks are made!)
     //         you can set enabled/disabled flag, tho (but iterator can still return objects disabled inside it)
     // trace line along the grid, calling `cb` for all objects in passed cells, in no particular order
+    //WARNING: don't change tags in callbacks here!
     function forEachAlongLine (const x0, y0, x1, y1: Integer; cb: TGridAlongQueryCB; tagmask: Integer=-1; log: Boolean=false): ITP;
 
     // debug
@@ -395,6 +405,7 @@ begin
   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
@@ -446,7 +457,6 @@ procedure TBodyGridBase.forEachBodyCell (body: TBodyProxyId; cb: TCellQueryCB);
 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
@@ -455,11 +465,10 @@ begin
     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;
@@ -482,7 +491,7 @@ begin
   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;
@@ -523,6 +532,41 @@ begin
 end;
 
 
+function TBodyGridBase.getBodyWH (body: TBodyProxyId; out rw, rh: Integer): Boolean; inline;
+begin
+  if (body >= 0) and (body < Length(mProxies)) then
+  begin
+    with mProxies[body] do begin rw := mWidth; rh := mHeight; end;
+    result := true;
+  end
+  else
+  begin
+    rw := 0;
+    rh := 0;
+    result := false;
+  end;
+end;
+
+
+function TBodyGridBase.getBodyDims (body: TBodyProxyId; out rx, ry, rw, rh: Integer): Boolean; inline;
+begin
+  if (body >= 0) and (body < Length(mProxies)) then
+  begin
+    with mProxies[body] do begin rx := mX; ry := mY; rw := mWidth; rh := mHeight; end;
+    result := true;
+  end
+  else
+  begin
+    rx := 0;
+    ry := 0;
+    rw := 0;
+    rh := 0;
+    result := false;
+  end;
+end;
+
+
+
 // ////////////////////////////////////////////////////////////////////////// //
 function TBodyGridBase.getProxyEnabled (pid: TBodyProxyId): Boolean; inline;
 begin
@@ -560,7 +604,7 @@ begin
     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
@@ -569,7 +613,6 @@ begin
   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;
@@ -582,7 +625,7 @@ begin
     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;
@@ -677,21 +720,42 @@ begin
   pc := mGrid[grida];
   if (pc <> -1) then
   begin
-    pi := @mCells[pc];
-    if (pi.bodies[High(TGridCell.bodies)] = -1) then
+    {$IF DEFINED(D2F_DEBUG)}
+    cidx := pc;
+    while (cidx <> -1) do
     begin
-      // can add here
-      for f := 0 to High(TGridCell.bodies) do
+      pi := @mCells[cidx];
+      for f := 0 to GridCellBucketSize-1 do
       begin
-        if (pi.bodies[f] = -1) then
+        if (pi.bodies[f] = -1) then break;
+        if (pi.bodies[f] = bodyId) then raise Exception.Create('trying to insert already inserted proxy');
+      end;
+      cidx := pi.next;
+    end;
+    {$ENDIF}
+    cidx := pc;
+    while (cidx <> -1) do
+    begin
+      pi := @mCells[cidx];
+      // check "has room" flag
+      if (pi.bodies[GridCellBucketSize-1] = -1) then
+      begin
+        // can add here
+        for f := 0 to GridCellBucketSize-1 do
         begin
-          pi.bodies[f] := bodyId;
-          if (f+1 < Length(TGridCell.bodies)) then pi.bodies[f+1] := -1;
-          exit;
+          if (pi.bodies[f] = -1) then
+          begin
+            pi.bodies[f] := bodyId;
+            if (f+1 < GridCellBucketSize) then pi.bodies[f+1] := -1;
+            exit;
+          end;
         end;
+        raise Exception.Create('internal error in grid inserter');
       end;
-      raise Exception.Create('internal error in grid inserter');
+      // no room, go to next cell in list (if there is any)
+      cidx := pi.next;
     end;
+    // no room in cells, add new cell to list
   end;
   // either no room, or no cell at all
   cidx := allocCell();
@@ -726,7 +790,7 @@ begin
   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
@@ -739,12 +803,12 @@ 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;
@@ -753,7 +817,6 @@ begin
   end;
 end;
 
-// absolutely not tested
 procedure TBodyGridBase.removeInternal (body: TBodyProxyId);
 var
   px: PBodyProxyRec;
@@ -793,7 +856,15 @@ begin
   y0 := px.mY;
   w := px.mWidth;
   h := px.mHeight;
+  {$IF DEFINED(D2F_DEBUG_MOVER)}
+  e_WriteLog(Format('proxy #%d: MOVERESIZE: xg=%d;yg=%d;w=%d;h=%d;nx=%d;ny=%d;nw=%d;nh=%d', [body, x0-mMinX, y0-mMinY, w, h, nx-mMinX, ny-mMinY, nw, nh]), MSG_NOTIFY);
+  {$ENDIF}
   if (nx = x0) and (ny = y0) and (nw = w) and (nh = h) then exit;
+  // map -> grid
+  Dec(x0, mMinX);
+  Dec(y0, mMinY);
+  Dec(nx, mMinX);
+  Dec(ny, mMinY);
   // did any corner crossed tile boundary?
   if (x0 div mTileSize <> nx div mTileSize) or
      (y0 div mTileSize <> ny div mTileSize) or
@@ -801,16 +872,16 @@ begin
      ((y0+h) div mTileSize <> (ny+nh) div mTileSize) then
   begin
     removeInternal(body);
-    px.mX := nx;
-    px.mY := ny;
+    px.mX := nx+mMinX;
+    px.mY := ny+mMinY;
     px.mWidth := nw;
     px.mHeight := nh;
     insertInternal(body);
   end
   else
   begin
-    px.mX := nx;
-    px.mY := ny;
+    px.mX := nx+mMinX;
+    px.mY := ny+mMinY;
     px.mWidth := nw;
     px.mHeight := nh;
   end;
@@ -835,9 +906,9 @@ begin
   if (nx = x0) and (ny = y0) then exit;
   // map -> grid
   Dec(x0, mMinX);
-  Dec(y0, mMinX);
+  Dec(y0, mMinY);
   Dec(nx, mMinX);
-  Dec(ny, mMinX);
+  Dec(ny, mMinY);
   // check for heavy work
   pw := px.mWidth;
   ph := px.mHeight;
@@ -849,6 +920,9 @@ begin
   ogy1 := (y0+ph-1) div mTileSize;
   ngx1 := (nx+pw-1) div mTileSize;
   ngy1 := (ny+ph-1) div mTileSize;
+  {$IF DEFINED(D2F_DEBUG_MOVER)}
+  e_WriteLog(Format('proxy #%d: checkmove: xg=%d;yg=%d;w=%d;h=%d;nx=%d;ny=%d og:(%d,%d)-(%d,%d); ng:(%d,%d)-(%d,%d)', [body, x0, y0, pw, ph, nx, ny, ogx0, ogy0, ogx1, ogy1, ngx0, ngy0, ngx1, ngy1]), MSG_NOTIFY);
+  {$ENDIF}
   if (ogx0 <> ngx0) or (ogy0 <> ngy0) or (ogx1 <> ngx1) or (ogy1 <> ngy1) then
   begin
     // crossed tile boundary, do heavy work
@@ -856,7 +930,9 @@ begin
     gh := mHeight;
     // cycle with old rect, remove body where it is necessary
     // optimized for horizontal moves
-    //e_WriteLog(Format('og:(%d,%d)-(%d,%d); ng:(%d,%d)-(%d,%d)', [ogx0, ogy0, ogx1, ogy1, ngx0, ngy0, ngx1, ngy1]), MSG_NOTIFY);
+    {$IF DEFINED(D2F_DEBUG_MOVER)}
+    e_WriteLog(Format('proxy #%d: xg=%d;yg=%d;w=%d;h=%d;nx=%d;ny=%d og:(%d,%d)-(%d,%d); ng:(%d,%d)-(%d,%d)', [body, x0, y0, pw, ph, nx, ny, ogx0, ogy0, ogx1, ogy1, ngx0, ngy0, ngx1, ngy1]), MSG_NOTIFY);
+    {$ENDIF}
     // remove stale marks
     if not ((ogy0 >= gh) or (ogy1 < 0)) and
        not ((ogx0 >= gw) or (ogx1 < 0)) then
@@ -865,7 +941,9 @@ begin
       if (ogy0 < 0) then ogy0 := 0;
       if (ogx1 > gw-1) then ogx1 := gw-1;
       if (ogy1 > gh-1) then ogy1 := gh-1;
-      //e_WriteLog(Format(' norm og:(%d,%d)-(%d,%d)', [ogx0, ogy0, ogx1, ogy1]), MSG_NOTIFY);
+      {$IF DEFINED(D2F_DEBUG_MOVER)}
+      e_WriteLog(Format(' norm og:(%d,%d)-(%d,%d)', [ogx0, ogy0, ogx1, ogy1]), MSG_NOTIFY);
+      {$ENDIF}
       for gx := ogx0 to ogx1 do
       begin
         if (gx < ngx0) or (gx > ngx1) then
@@ -873,7 +951,9 @@ begin
           // this column is completely outside of new rect
           for gy := ogy0 to ogy1 do
           begin
-            //e_WriteLog(Format('  remove:(%d,%d)', [gx, gy]), MSG_NOTIFY);
+            {$IF DEFINED(D2F_DEBUG_MOVER)}
+            e_WriteLog(Format('  remove0:(%d,%d)', [gx, gy]), MSG_NOTIFY);
+            {$ENDIF}
             remover(gy*gw+gx, body);
           end;
         end
@@ -884,7 +964,9 @@ begin
           begin
             if (gy < ngy0) or (gy > ngy1) then
             begin
-              //e_WriteLog(Format('  remove:(%d,%d)', [gx, gy]), MSG_NOTIFY);
+              {$IF DEFINED(D2F_DEBUG_MOVER)}
+              e_WriteLog(Format('  remove1:(%d,%d)', [gx, gy]), MSG_NOTIFY);
+              {$ENDIF}
               remover(gy*gw+gx, body);
             end;
           end;
@@ -899,7 +981,9 @@ begin
       if (ngy0 < 0) then ngy0 := 0;
       if (ngx1 > gw-1) then ngx1 := gw-1;
       if (ngy1 > gh-1) then ngy1 := gh-1;
-      //e_WriteLog(Format(' norm ng:(%d,%d)-(%d,%d)', [ngx0, ngy0, ngx1, ngy1]), MSG_NOTIFY);
+      {$IF DEFINED(D2F_DEBUG_MOVER)}
+      e_WriteLog(Format(' norm ng:(%d,%d)-(%d,%d)', [ngx0, ngy0, ngx1, ngy1]), MSG_NOTIFY);
+      {$ENDIF}
       for gx := ngx0 to ngx1 do
       begin
         if (gx < ogx0) or (gx > ogx1) then
@@ -907,7 +991,9 @@ begin
           // this column is completely outside of old rect
           for gy := ngy0 to ngy1 do
           begin
-            //e_WriteLog(Format('  insert:(%d,%d)', [gx, gy]), MSG_NOTIFY);
+            {$IF DEFINED(D2F_DEBUG_MOVER)}
+            e_WriteLog(Format('  insert0:(%d,%d)', [gx, gy]), MSG_NOTIFY);
+            {$ENDIF}
             inserter(gy*gw+gx, body);
           end;
         end
@@ -918,7 +1004,9 @@ begin
           begin
             if (gy < ogy0) or (gy > ogy1) then
             begin
-              //e_WriteLog(Format('  insert:(%d,%d)', [gx, gy]), MSG_NOTIFY);
+              {$IF DEFINED(D2F_DEBUG_MOVER)}
+              e_WriteLog(Format('  insert1:(%d,%d)', [gx, gy]), MSG_NOTIFY);
+              {$ENDIF}
               inserter(gy*gw+gx, body);
             end;
           end;
@@ -926,6 +1014,12 @@ begin
       end;
     end;
     // done
+  end
+  else
+  begin
+    {$IF DEFINED(D2F_DEBUG_MOVER)}
+    e_WriteLog(Format('proxy #%d: GRID OK: xg=%d;yg=%d;w=%d;h=%d;nx=%d;ny=%d og:(%d,%d)-(%d,%d); ng:(%d,%d)-(%d,%d)', [body, x0, y0, pw, ph, nx, ny, ogx0, ogy0, ogx1, ogy1, ngx0, ngy0, ngx1, ngy1]), MSG_NOTIFY);
+    {$ENDIF}
   end;
   // update coordinates
   px.mX := nx+mMinX;
@@ -940,10 +1034,13 @@ begin
   if (body < 0) or (body > High(mProxies)) then exit; // just in case
   // check if tile coords was changed
   px := @mProxies[body];
-  x0 := px.mX;
-  y0 := px.mY;
+  x0 := px.mX-mMinX;
+  y0 := px.mY-mMinY;
   w := px.mWidth;
   h := px.mHeight;
+  {$IF DEFINED(D2F_DEBUG_MOVER)}
+  e_WriteLog(Format('proxy #%d: RESIZE: xg=%d;yg=%d;w=%d;h=%d;nw=%d;nh=%d', [body, x0, y0, w, h, nw, nh]), MSG_NOTIFY);
+  {$ENDIF}
   if ((x0+w) div mTileSize <> (x0+nw) div mTileSize) or
      ((y0+h) div mTileSize <> (y0+nh) div mTileSize) then
   begin
@@ -964,7 +1061,7 @@ end;
 
 // ////////////////////////////////////////////////////////////////////////// //
 // no callback: return `true` on the first hit
-function TBodyGridBase.forEachAtPoint (x, y: Integer; cb: TGridQueryCB; tagmask: Integer=-1): ITP;
+function TBodyGridBase.forEachAtPoint (x, y: Integer; cb: TGridQueryCB; tagmask: Integer=-1; exittag: PInteger=nil): ITP;
 var
   f: Integer;
   idx, curci: Integer;
@@ -974,15 +1071,25 @@ var
   ptag: Integer;
 begin
   result := Default(ITP);
+  if (exittag <> nil) then exittag^ := 0;
   tagmask := tagmask and TagFullMask;
   if (tagmask = 0) then exit;
 
+  {$IF DEFINED(D2F_DEBUG_XXQ)}
+  if (assigned(cb)) then e_WriteLog(Format('0: grid pointquery: (%d,%d)', [x, y]), MSG_NOTIFY);
+  {$ENDIF}
+
   // make coords (0,0)-based
   Dec(x, mMinX);
   Dec(y, mMinY);
   if (x < 0) or (y < 0) or (x >= mWidth*mTileSize) or (y >= mHeight*mTileSize) then exit;
 
   curci := mGrid[(y div mTileSize)*mWidth+(x div mTileSize)];
+
+  {$IF DEFINED(D2F_DEBUG_XXQ)}
+  if (assigned(cb)) then e_WriteLog(Format('1: grid pointquery: (%d,%d) (%d,%d) %d', [x, y, (x div mTileSize), (y div mTileSize), curci]), MSG_NOTIFY);
+  {$ENDIF}
+
   // restore coords
   Inc(x, mMinX);
   Inc(y, mMinY);
@@ -997,26 +1104,44 @@ begin
   end;
   lq := mLastQuery;
 
+  {$IF DEFINED(D2F_DEBUG_XXQ)}
+  if (assigned(cb)) then e_WriteLog(Format('2: grid pointquery: (%d,%d); lq=%u', [x, y, lq]), MSG_NOTIFY);
+  {$ENDIF}
+
   while (curci <> -1) do
   begin
+    {$IF DEFINED(D2F_DEBUG_XXQ)}
+    if (assigned(cb)) then e_WriteLog(Format(' cell #%d', [curci]), MSG_NOTIFY);
+    {$ENDIF}
     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]];
-      ptag := px.mTag;
-      if ((ptag and TagDisabled) = 0) and ((ptag and tagmask) <> 0) and (px.mQueryMark <> lq) then
+      {$IF DEFINED(D2F_DEBUG_XXQ)}
+      if (assigned(cb)) then e_WriteLog(Format('  proxy #%d; qm:%u; tag:%08x; tagflag:%d  %u', [cc.bodies[f], px.mQueryMark, px.mTag, (px.mTag and tagmask), LongWord(px.mObj)]), MSG_NOTIFY);
+      {$ENDIF}
+      // shit. has to do it this way, so i can change tag in callback
+      if (px.mQueryMark <> lq) then
       begin
-        if (x >= px.mX) and (y >= px.mY) and (x < px.mX+px.mWidth) and (y < px.mY+px.mHeight) then
+        px.mQueryMark := lq;
+        ptag := px.mTag;
+        if ((ptag and TagDisabled) = 0) and ((ptag and tagmask) <> 0) and
+           (x >= px.mX) and (y >= px.mY) and (x < px.mX+px.mWidth) and (y < px.mY+px.mHeight) then
         begin
-          px.mQueryMark := lq;
           if assigned(cb) then
           begin
-            if cb(px.mObj, ptag) then begin result := px.mObj; exit; end;
+            if cb(px.mObj, ptag) then
+            begin
+              result := px.mObj;
+              if (exittag <> nil) then exittag^ := ptag;
+              exit;
+            end;
           end
           else
           begin
             result := px.mObj;
+            if (exittag <> nil) then exittag^ := ptag;
             exit;
           end;
         end;
@@ -1087,28 +1212,26 @@ begin
       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]];
+          // shit. has to do it this way, so i can change tag in callback
+          if (px.mQueryMark = lq) then continue;
+          px.mQueryMark := lq;
           ptag := px.mTag;
           if (not allowDisabled) and ((ptag and TagDisabled) <> 0) then continue;
-          if ((ptag and tagmask) <> 0) and (px.mQueryMark <> lq) then
-          //if ((ptag and TagDisabled) = 0) and ((ptag and tagmask) <> 0) and (px.mQueryMark <> lq) then
-          //if ( ((ptag and TagDisabled) = 0) = ignoreDisabled) and ((ptag and tagmask) <> 0) and (px.mQueryMark <> lq) then
+          if ((ptag and tagmask) = 0) then continue;
+          if (x0 >= px.mX+px.mWidth) or (y0 >= px.mY+px.mHeight) then continue;
+          if (x0+w <= px.mX) or (y0+h <= px.mY) then continue;
+          if assigned(cb) then
           begin
-            if (x0 >= px.mX+px.mWidth) or (y0 >= px.mY+px.mHeight) then continue;
-            if (x0+w <= px.mX) or (y0+h <= px.mY) then continue;
-            px.mQueryMark := lq;
-            if assigned(cb) then
-            begin
-              if cb(px.mObj, ptag) then begin result := px.mObj; exit; end;
-            end
-            else
-            begin
-              result := px.mObj;
-              exit;
-            end;
+            if cb(px.mObj, ptag) then begin result := px.mObj; exit; end;
+          end
+          else
+          begin
+            result := px.mObj;
+            exit;
           end;
         end;
         curci := cc.next;
@@ -1167,7 +1290,15 @@ begin
   ey := ay1; // why not?
   if (tagmask = 0) then exit;
 
-  if (ax0 = ax1) and (ay0 = ay1) then exit; // as the first point is ignored, just get outta here
+  if (ax0 = ax1) and (ay0 = ay1) then
+  begin
+    result := forEachAtPoint(ax0, ay0, nil, tagmask, @ptag);
+    if (result <> nil) then
+    begin
+      if assigned(cb) and not cb(result, ptag, ax0, ay0, ax0, ay0) then result := Default(ITP);
+    end;
+    exit;
+  end;
 
   lastDistSq := distanceSq(ax0, ay0, ax1, ay1)+1;
 
@@ -1312,20 +1443,49 @@ begin
   dx2 -= dy2;
 
   // first move, to skip starting point
-  if (xd = term) then exit;
+  // DON'T DO THIS! loop will take care of that
+  if (xd = term) then
+  begin
+    result := forEachAtPoint(ax0, ay0, nil, tagmask, @ptag);
+    if (result <> nil) then
+    begin
+      if assigned(cb) then
+      begin
+        if cb(result, ptag, ax0, ay0, ax0, ay0) then
+        begin
+          ex := ax0;
+          ey := ay0;
+        end
+        else
+        begin
+          result := nil;
+        end;
+      end
+      else
+      begin
+        ex := ax0;
+        ey := ay0;
+      end;
+    end;
+    exit;
+  end;
+
   prevx := xptr^+minx;
   prevy := yptr^+miny;
+  (*
   // move coords
   if (e >= 0) then begin yd += sty; e -= dx2; end else e += dy2;
   xd += stx;
   // done?
   if (xd = term) then exit;
+  *)
 
   {$IF DEFINED(D2F_DEBUG)}
   if (xptr^ < 0) or (yptr^ < 0) or (xptr^ >= gw*tsize) and (yptr^ >= gh*tsize) then raise Exception.Create('raycaster internal error (0)');
   {$ENDIF}
-  lastGA := (yptr^ div tsize)*gw+(xptr^ div tsize);
-  ccidx := mGrid[lastGA];
+  // DON'T DO THIS! loop will take care of that
+  //lastGA := (yptr^ div tsize)*gw+(xptr^ div tsize);
+  //ccidx := mGrid[lastGA];
 
   {$IF DEFINED(D2F_DEBUG_RAYTRACE)}
   //if assigned(dbgRayTraceTileHitCB) then e_WriteLog('1:TRACING!', MSG_NOTIFY);
@@ -1357,6 +1517,9 @@ begin
     {$ENDIF}
     // new tile?
     ga := (yptr^ div tsize)*gw+(xptr^ div tsize);
+    {$IF DEFINED(D2F_DEBUG_RAYTRACE)}
+    if assigned(dbgRayTraceTileHitCB) then e_WriteLog(Format(' xd=%d; term=%d; gx=%d; gy=%d; ga=%d; lastga=%d', [xd, term, xptr^, yptr^, ga, lastGA]), MSG_NOTIFY);
+    {$ENDIF}
     if (ga <> lastGA) then
     begin
       // yes
@@ -1392,7 +1555,7 @@ begin
       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]];
@@ -1477,6 +1640,16 @@ begin
     if (e >= 0) then begin yd += sty; e -= dx2; end else e += dy2;
     xd += stx;
   end;
+  // we can travel less than one cell
+  if wasHit and not assigned(cb) then
+  begin
+    result := lastObj;
+  end
+  else
+  begin
+    ex := ax1; // why not?
+    ey := ay1; // why not?
+  end;
 end;
 
 
@@ -1672,7 +1845,7 @@ begin
       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]];
@@ -1695,4 +1868,324 @@ begin
 end;
 
 
+// ////////////////////////////////////////////////////////////////////////// //
+(*
+function TBodyGridBase.traceRayWhileIn (const x0, y0, x1, y1: Integer; tagmask: Integer=-1): ITP; overload;
+var
+  ex, ey: Integer;
+begin
+  result := traceRayWhileIn(ex, ey, x0, y0, x1, y1, tagmask);
+end;
+
+
+// FUCKIN' PASTA!
+function TBodyGridBase.traceRayWhileIn (out ex, ey: Integer; const ax0, ay0, ax1, ay1: Integer; tagmask: Integer=-1): ITP;
+const
+  tsize = mTileSize;
+var
+  wx0, wy0, wx1, wy1: Integer; // window coordinates
+  stx, sty: Integer; // "steps" for x and y axes
+  dsx, dsy: Integer; // "lengthes" for x and y axes
+  dx2, dy2: Integer; // "double lengthes" for x and y axes
+  xd, yd: Integer; // current coord
+  e: Integer; // "error" (as in bresenham algo)
+  rem: Integer;
+  term: Integer;
+  xptr, yptr: PInteger;
+  xfixed: Boolean;
+  temp: Integer;
+  prevx, prevy: Integer;
+  lastDistSq: Integer;
+  ccidx, curci: Integer;
+  hasUntried: Boolean;
+  lastGA: Integer = -1;
+  ga, x, y: Integer;
+  lastObj: ITP;
+  wasHit: Boolean = false;
+  gw, gh, minx, miny, maxx, maxy: Integer;
+  cc: PGridCell;
+  px: PBodyProxyRec;
+  lq: LongWord;
+  f, ptag, distSq: Integer;
+  x0, y0, x1, y1: Integer;
+  inx, iny: Integer;
+begin
+  result := Default(ITP);
+  lastObj := Default(ITP);
+  tagmask := tagmask and TagFullMask;
+  ex := ax1; // why not?
+  ey := ay1; // why not?
+  if (tagmask = 0) then exit;
+
+  if (ax0 = ax1) and (ay0 = ay1) then exit; // doesn't matter
+
+  // we should start inside
+  if (forEachAtPoint(ax0, ay0, nil, tagmask, @ptag) = nil) then
+  begin
+    ex := ax0; // why not?
+    ey := ay0; // why not?
+    exit;
+  end;
+
+  lastDistSq := distanceSq(ax0, ay0, ax1, ay1)+1;
+
+  gw := mWidth;
+  gh := mHeight;
+  minx := mMinX;
+  miny := mMinY;
+  maxx := gw*tsize-1;
+  maxy := gh*tsize-1;
+
+  x0 := ax0;
+  y0 := ay0;
+  x1 := ax1;
+  y1 := ay1;
+
+  // offset query coords to (0,0)-based
+  Dec(x0, minx);
+  Dec(y0, miny);
+  Dec(x1, minx);
+  Dec(y1, miny);
+
+  // clip rectange
+  wx0 := 0;
+  wy0 := 0;
+  wx1 := maxx;
+  wy1 := maxy;
+
+  // horizontal setup
+  if (x0 < x1) then
+  begin
+    // from left to right
+    if (x0 > wx1) or (x1 < wx0) then exit; // out of screen
+    stx := 1; // going right
+  end
+  else
+  begin
+    // from right to left
+    if (x1 > wx1) or (x0 < wx0) then exit; // out of screen
+    stx := -1; // going left
+    x0 := -x0;
+    x1 := -x1;
+    wx0 := -wx0;
+    wx1 := -wx1;
+    swapInt(wx0, wx1);
+  end;
+
+  // vertical setup
+  if (y0 < y1) then
+  begin
+    // from top to bottom
+    if (y0 > wy1) or (y1 < wy0) then exit; // out of screen
+    sty := 1; // going down
+  end
+  else
+  begin
+    // from bottom to top
+    if (y1 > wy1) or (y0 < wy0) then exit; // out of screen
+    sty := -1; // going up
+    y0 := -y0;
+    y1 := -y1;
+    wy0 := -wy0;
+    wy1 := -wy1;
+    swapInt(wy0, wy1);
+  end;
+
+  dsx := x1-x0;
+  dsy := y1-y0;
+
+  if (dsx < dsy) then
+  begin
+    xptr := @yd;
+    yptr := @xd;
+    swapInt(x0, y0);
+    swapInt(x1, y1);
+    swapInt(dsx, dsy);
+    swapInt(wx0, wy0);
+    swapInt(wx1, wy1);
+    swapInt(stx, sty);
+  end
+  else
+  begin
+    xptr := @xd;
+    yptr := @yd;
+  end;
+
+  dx2 := 2*dsx;
+  dy2 := 2*dsy;
+  xd := x0;
+  yd := y0;
+  e := 2*dsy-dsx;
+  term := x1;
+
+  xfixed := false;
+  if (y0 < wy0) then
+  begin
+    // clip at top
+    temp := dx2*(wy0-y0)-dsx;
+    xd += temp div dy2;
+    rem := temp mod dy2;
+    if (xd > wx1) then exit; // x is moved out of clipping rect, nothing to do
+    if (xd+1 >= wx0) then
+    begin
+      yd := wy0;
+      e -= rem+dsx;
+      if (rem > 0) then begin Inc(xd); e += dy2; end;
+      xfixed := true;
+    end;
+  end;
+
+  if (not xfixed) and (x0 < wx0) then
+  begin
+    // clip at left
+    temp := dy2*(wx0-x0);
+    yd += temp div dx2;
+    rem := temp mod dx2;
+    if (yd > wy1) or (yd = wy1) and (rem >= dsx) then exit;
+    xd := wx0;
+    e += rem;
+    if (rem >= dsx) then begin Inc(yd); e -= dx2; end;
+  end;
+
+  if (y1 > wy1) then
+  begin
+    // clip at bottom
+    temp := dx2*(wy1-y0)+dsx;
+    term := x0+temp div dy2;
+    rem := temp mod dy2;
+    if (rem = 0) then Dec(term);
+  end;
+
+  if (term > wx1) then term := wx1; // clip at right
+
+  Inc(term); // draw last point
+  //if (term = xd) then exit; // this is the only point, get out of here
+
+  if (sty = -1) then yd := -yd;
+  if (stx = -1) then begin xd := -xd; term := -term; end;
+  dx2 -= dy2;
+
+  // first move, to skip starting point
+  // DON'T DO THIS! loop will take care of that
+  if (xd = term) then
+  begin
+    result := forEachAtPoint(ax0, ay0, nil, tagmask, @ptag);
+    if (result <> nil) and ((ptag and tagmask) <> 0) then result := nil;
+    exit;
+  end;
+
+  prevx := xptr^+minx;
+  prevy := yptr^+miny;
+
+  // increase query counter
+  Inc(mLastQuery);
+  if (mLastQuery = 0) then
+  begin
+    // just in case of overflow
+    mLastQuery := 1;
+    for f := 0 to High(mProxies) do mProxies[f].mQueryMark := 0;
+  end;
+  lq := mLastQuery;
+
+  ccidx := -1;
+  // draw it; can omit checks
+  while (xd <> term) do
+  begin
+    // check cell(s)
+    // new tile?
+    ga := (yptr^ div tsize)*gw+(xptr^ div tsize);
+    if (ga <> lastGA) then
+    begin
+      // yes
+      lastGA := ga;
+      ccidx := mGrid[lastGA];
+      // no objects in cell == exit
+      if (ccidx = -1) then exit;
+    end;
+    // has something to process in this tile?
+    if (ccidx <> -1) then
+    begin
+      // process cell
+      curci := ccidx;
+      // convert coords to map (to avoid ajdusting coords inside the loop)
+      x := xptr^+minx;
+      y := yptr^+miny;
+      wasHit := false;
+      // process cell list
+      while (curci <> -1) do
+      begin
+        cc := @mCells[curci];
+        for f := 0 to GridCellBucketSize-1 do
+        begin
+          if (cc.bodies[f] = -1) then break;
+          px := @mProxies[cc.bodies[f]];
+          ptag := px.mTag;
+          if ((ptag and TagDisabled) = 0) and (px.mQueryMark <> lq) then
+          begin
+function lineAABBIntersects (x0, y0, x1, y1: Integer; bx, by, bw, bh: Integer; out inx, iny: Integer): Boolean;
+            // can we process this proxy?
+            if (x >= px.mX) and (y >= px.mY) and (x < px.mX+px.mWidth) and (y < px.mY+px.mHeight) then
+            begin
+              px.mQueryMark := lq; // mark as processed
+              if ((ptag and tagmask) = 0) then
+              begin
+                result := px.mObj;
+                ex := x;
+                ey := y;
+                exit;
+              end;
+              // march out of the panel/cell
+              while (xd <> term) do
+              begin
+                if (e >= 0) then begin yd += sty; e -= dx2; end else e += dy2;
+                xd += stx;
+                // new cell?
+                ga := (yptr^ div tsize)*gw+(xptr^ div tsize);
+                if (ga <> lastGA) then break;
+                // out of panel?
+                if not ((x >= px.mX) and (y >= px.mY) and (x < px.mX+px.mWidth) and (y < px.mY+px.mHeight)) then break;
+              end;
+            end;
+          end;
+        end;
+        // next cell
+        curci := cc.next;
+      end;
+      // still has something interesting in this cell?
+      if not hasUntried then
+      begin
+        // nope, don't process this cell anymore; signal cell completion
+        ccidx := -1;
+        if assigned(cb) then
+        begin
+          if cb(nil, 0, x, y, prevx, prevy) then begin result := lastObj; exit; end;
+        end
+        else if wasHit then
+        begin
+          result := lastObj;
+          exit;
+        end;
+      end;
+    end;
+    //putPixel(xptr^, yptr^);
+    // move coords
+    prevx := xptr^+minx;
+    prevy := yptr^+miny;
+    if (e >= 0) then begin yd += sty; e -= dx2; end else e += dy2;
+    xd += stx;
+  end;
+  // we can travel less than one cell
+  if wasHit and not assigned(cb) then
+  begin
+    result := lastObj;
+  end
+  else
+  begin
+    ex := ax1; // why not?
+    ey := ay1; // why not?
+  end;
+end;
+*)
+
+
 end.