From 443705324dafadbc9b3da84365ad68ae7f52d9ba Mon Sep 17 00:00:00 2001
From: Ketmar Dark <ketmar@ketmar.no-ip.org>
Date: Thu, 18 Jan 2018 15:10:31 +0200
Subject: [PATCH] removed callback from `Grid.traceRay()` (it wasn't used
 anyway)

---
 src/game/g_grid.pas | 18 ++++++------------
 src/game/g_map.pas  |  4 ++--
 2 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/src/game/g_grid.pas b/src/game/g_grid.pas
index c2d4412..30ed8ee 100644
--- a/src/game/g_grid.pas
+++ b/src/game/g_grid.pas
@@ -218,13 +218,11 @@ 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)
-    // cb with `(nil)` will be called before processing new tile
-    // no callback: return object of the nearest hit or nil
+    // return object of the nearest hit or nil
     // if `inverted` is true, trace will register bodies *exluding* tagmask
-    // `cb` is used unconvetionally here: if it returns `false`, tracer will ignore the object
     //WARNING: don't change tags in callbacks here!
-    function traceRay (const x0, y0, x1, y1: Integer; cb: TGridQueryCB; tagmask: Integer=-1): ITP; overload;
-    function traceRay (out ex, ey: Integer; const ax0, ay0, ax1, ay1: Integer; cb: TGridQueryCB; tagmask: Integer=-1): ITP;
+    function traceRay (const x0, y0, x1, y1: Integer; tagmask: Integer=-1): ITP; overload;
+    function traceRay (out ex, ey: Integer; const ax0, ay0, ax1, ay1: Integer; tagmask: Integer=-1): ITP;
 
     // return `false` if we're still inside at the end
     // line should be either strict horizontal, or strict vertical, otherwise an exception will be thrown
@@ -1859,17 +1857,17 @@ end;
 
 
 // ////////////////////////////////////////////////////////////////////////// //
-function TBodyGridBase.traceRay (const x0, y0, x1, y1: Integer; cb: TGridQueryCB; tagmask: Integer=-1): ITP;
+function TBodyGridBase.traceRay (const x0, y0, x1, y1: Integer; tagmask: Integer=-1): ITP;
 var
   ex, ey: Integer;
 begin
-  result := traceRay(ex, ey, x0, y0, x1, y1, cb, tagmask);
+  result := traceRay(ex, ey, x0, y0, x1, y1, tagmask);
 end;
 
 
 // no callback: return `true` on the nearest hit
 // you are not supposed to understand this
-function TBodyGridBase.traceRay (out ex, ey: Integer; const ax0, ay0, ax1, ay1: Integer; cb: TGridQueryCB; tagmask: Integer=-1): ITP;
+function TBodyGridBase.traceRay (out ex, ey: Integer; const ax0, ay0, ax1, ay1: Integer; tagmask: Integer=-1): ITP;
 var
   lw: TLineWalker;
   ccidx: Integer;
@@ -1943,10 +1941,6 @@ begin
         if ((ptag and TagDisabled) = 0) and ((ptag and tagmask) <> 0) and (px.mQueryMark <> lq) then
         begin
           px.mQueryMark := lq; // mark as processed
-          if assigned(cb) then
-          begin
-            if not cb(px.mObj, ptag) then continue;
-          end;
           // get adjusted proxy coords
           px0 := px.mX-minx;
           py0 := px.mY-miny;
diff --git a/src/game/g_map.pas b/src/game/g_map.pas
index 29ece6f..f78ffe1 100644
--- a/src/game/g_map.pas
+++ b/src/game/g_map.pas
@@ -562,7 +562,7 @@ function g_Map_traceToNearestWall (x0, y0, x1, y1: Integer; hitx: PInteger=nil;
 var
   ex, ey: Integer;
 begin
-  result := mapGrid.traceRay(ex, ey, x0, y0, x1, y1, nil, (GridTagWall or GridTagDoor));
+  result := mapGrid.traceRay(ex, ey, x0, y0, x1, y1, (GridTagWall or GridTagDoor));
   if (result <> nil) then
   begin
     if (hitx <> nil) then hitx^ := ex;
@@ -580,7 +580,7 @@ function g_Map_traceToNearest (x0, y0, x1, y1: Integer; tag: Integer; hitx: PInt
 var
   ex, ey: Integer;
 begin
-  result := mapGrid.traceRay(ex, ey, x0, y0, x1, y1, nil, tag);
+  result := mapGrid.traceRay(ex, ey, x0, y0, x1, y1, tag);
   if (result <> nil) then
   begin
     if (hitx <> nil) then hitx^ := ex;
-- 
2.29.2