From 75673cfcb8c3c3ccdd5808c94f6ca2081199d473 Mon Sep 17 00:00:00 2001 From: "elly1989@rocketmail.com" Date: Wed, 28 Nov 2012 03:10:28 +0000 Subject: [PATCH] !(bitfield & FLAG) is a NAND (bitfield & ~FLAG) is not a NAND Should fix some things colliding with directional windows when moving parallel on the same turf. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5214 316c924e-a436-60f5-8080-3fe189b3f50e --- code/game/turfs/turf.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm index 101cb43a43c..c9d8d9235c8 100644 --- a/code/game/turfs/turf.dm +++ b/code/game/turfs/turf.dm @@ -74,7 +74,7 @@ //First, check objects to block exit that are not on the border for(var/obj/obstacle in mover.loc) - if((obstacle.flags & ~ON_BORDER) && (mover != obstacle) && (forget != obstacle)) + if(!(obstacle.flags & ON_BORDER) && (mover != obstacle) && (forget != obstacle)) if(!obstacle.CheckExit(mover, src)) mover.Bump(obstacle, 1) return 0