summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: ef5f8a6)
raw | patch | inline | side by side (parent: ef5f8a6)
author | Ketmar Dark <ketmar@ketmar.no-ip.org> | |
Thu, 17 Aug 2017 13:15:56 +0000 (16:15 +0300) | ||
committer | Ketmar Dark <ketmar@ketmar.no-ip.org> | |
Thu, 17 Aug 2017 14:41:07 +0000 (17:41 +0300) |
src/game/g_map.pas | patch | blob | history |
diff --git a/src/game/g_map.pas b/src/game/g_map.pas
index 77660a8dc3757c0d5b1e50dfb6787478a28f5a84..2579d27fb143ab75fab9dab09da7e4d2a3a20c80 100644 (file)
--- a/src/game/g_map.pas
+++ b/src/game/g_map.pas
//TODO: detailed profile?
if (profMapCollision <> nil) then profMapCollision.sectionBeginAccum('liquid coldet');
try
- if not gdbg_map_use_grid_coldet then
- begin
- result := g_Map_CollideLiquid_TextureOld(X, Y, Width, Height);
- end
- else
+ if gdbg_map_use_grid_coldet then
begin
texid := TEXTURE_NONE;
gMapGrid.forEachInAABB(X, Y, Width, Height, checker);
result := texid;
+ end
+ else
+ begin
+ result := g_Map_CollideLiquid_TextureOld(X, Y, Width, Height);
end;
finally
if (profMapCollision <> nil) then profMapCollision.sectionEnd();