Zoning/streaming refactor
This commit is contained in:
@@ -16,7 +16,7 @@ import Data.Monoid
|
||||
import Data.Maybe
|
||||
import Data.Function
|
||||
import Control.Lens
|
||||
import qualified Data.IntMap.Strict as IM
|
||||
--import qualified Data.IntMap.Strict as IM
|
||||
|
||||
import qualified Streaming.Prelude as S
|
||||
|
||||
@@ -84,7 +84,7 @@ pushOrCrush wls cr = case mapMaybe (pushOutFromWall (_crRad cr) cpos) wls of
|
||||
-- note the inclusion of endpoints in circOnSeg
|
||||
crOnWall :: Creature -> World -> Bool
|
||||
crOnWall cr = runIdentity
|
||||
. S.any_ (uncurry (circOnSeg' p r) . _wlLine)
|
||||
. S.any_ (uncurry (circOnSeg p r) . _wlLine)
|
||||
. S.filter (not . _wlWalkable)
|
||||
. wallsNearPoint p
|
||||
where
|
||||
|
||||
Reference in New Issue
Block a user