include touchy flag for position checks to prevent skipping over non-…

…solid touchy things
Helion-Engine · Jun 13, 2024 · 9c22392 · 9c22392
1 parent 40e0727
commit 9c22392
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/Core/World/Entities/Definition/Flags/EntityFlags.cs b/Core/World/Entities/Definition/Flags/EntityFlags.cs
@@ -1,5 +1,4 @@
 using Helion.Models;
-using System;
 
 namespace Helion.World.Entities.Definition.Flags;
 
@@ -8,6 +7,7 @@ public struct EntityFlags
     public const int SpecialFlag = FlagValue.Flag1;
     public const int SolidFlag = FlagValue.Flag2;
     public const int ShootableFlag = FlagValue.Flag3;
+    public const int TouchyFlag = FlagValue.Flag24;
 
     public int Flags1;
     public int Flags2;

diff --git a/Core/World/Physics/PhysicsManager.cs b/Core/World/Physics/PhysicsManager.cs
@@ -1111,7 +1111,8 @@ private void StackedEntityMoveZ(Entity entity)
         }
     }
 
-    private const int PositionValidFlags = EntityFlags.SpecialFlag | EntityFlags.SolidFlag | EntityFlags.ShootableFlag;
+    private const int PositionValidFlags1 = EntityFlags.SpecialFlag | EntityFlags.SolidFlag | EntityFlags.ShootableFlag;
+    private const int PositionValidFlags2 = EntityFlags.TouchyFlag;
 
     public unsafe bool IsPositionValid(Entity entity, double x, double y, TryMoveData tryMove)
     {
@@ -1166,7 +1167,7 @@ public unsafe bool IsPositionValid(Entity entity, double x, double y, TryMoveDat
 
                         nextEntity.BlockmapCount = checkCounter;
 
-                        if ((nextEntity.Flags.Flags1 & PositionValidFlags) == 0)
+                        if ((nextEntity.Flags.Flags1 & PositionValidFlags1) == 0 && (nextEntity.Flags.Flags2 & PositionValidFlags2) == 0)
                             continue;
 
                         var blockDist = nextEntity.Radius + entity.Radius;