From: Ketmar Dark <ketmar@ketmar.no-ip.org>
Date: Sat, 2 Sep 2017 19:54:53 +0000 (+0300)
Subject: particles: sparks should die in liquid (pshhhhh!)
X-Git-Url: http://deadsoftware.ru/gitweb?a=commitdiff_plain;h=be528d3dadda758afda02a5dbf7b89e05277a7a6;p=d2df-sdl.git

particles: sparks should die in liquid (pshhhhh!)
---

diff --git a/src/game/g_gfx.pas b/src/game/g_gfx.pas
index 0ec78f6..c365e66 100644
--- a/src/game/g_gfx.pas
+++ b/src/game/g_gfx.pas
@@ -1059,12 +1059,13 @@ begin
   if (dX <> 0) then
   begin
     // has some horizontal velocity
-    pan := g_Map_traceToNearest(x, y, x+dX, y+dY, GridTagObstacle, @ex, @ey);
+    pan := g_Map_traceToNearest(x, y, x+dX, y+dY, (GridTagObstacle or GridTagLiquid), @ex, @ey);
     if (x <> ex) then begin floorY := Unknown; ceilingY := Unknown; end; // dunno yet
     x := ex;
     y := ey;
     if (pan <> nil) then
     begin
+      if ((pan.tag and GridTagLiquid) <> 0) then begin die(); exit; end; // die in liquid
       // hit the wall; falling down vertically
       velX := 0;
       accelX := 0;