Stop all sound when stopping time

src/Dodge/Zoning/Base.hs

@@ -1,4 +1,17 @@
-module Dodge.Zoning.Base where
+module Dodge.Zoning.Base 
+    ( zoneExtract
+    , zoneOfPoint
+    , zonesExtract
+    , zoneOfSeg
+    , zoneOfRect
+    , zoneMonoid
+    , deZoneIX
+    , zoneOfPoint''
+    , zoneOfCirc
+    , zonesAroundPoint
+    , xIntercepts
+    , yIntercepts'
+    ) where
 
 import Control.Lens
 import qualified Data.IntSet as IS
@@ -21,9 +34,9 @@ makeIntInterval x y
     | x < y = [x .. y]
     | otherwise = [y .. x]
 
-makeInt2Interval :: Int2 -> Int2 -> [Int2]
-makeInt2Interval (V2 x1 y1) (V2 x2 y2) =
-    [V2 x y | x <- makeIntInterval x1 x2, y <- makeIntInterval y1 y2]
+--makeInt2Interval :: Int2 -> Int2 -> [Int2]
+--makeInt2Interval (V2 x1 y1) (V2 x2 y2) =
+--    [V2 x y | x <- makeIntInterval x1 x2, y <- makeIntInterval y1 y2]
 
 zoneOfPoint :: Float -> Point2 -> Int2
 zoneOfPoint = fmap . divTo

src/Dodge/Zoning/Cloud.hs

@@ -1,7 +1,5 @@
 module Dodge.Zoning.Cloud where
 
---import Data.Foldable
-import Control.Lens
 import Dodge.Data.World
 import Dodge.Zoning.Base
 import Geometry
@@ -13,10 +11,10 @@ clsNearPoint :: Point2 -> World -> [Cloud]
 clsNearPoint = nearPoint clZoneSize _clZoning
 
 clsNearSeg :: Point2 -> Point2 -> World -> [Cloud]
-clsNearSeg sp ep w = zonesExtract (w ^. cWorld . lWorld . clZoning) (zoneOfSeg clZoneSize sp ep)
+clsNearSeg = nearSeg clZoneSize _clZoning
 
 clsNearRect :: Point2 -> Point2 -> World -> [Cloud]
-clsNearRect sp ep w = zonesExtract (w ^. cWorld . lWorld . clZoning) $ zoneOfRect clZoneSize sp ep
+clsNearRect = nearRect clZoneSize _clZoning
 
 clsNearCirc :: Point2 -> Float -> World -> [Cloud]
 clsNearCirc p r = clsNearRect (p +.+ V2 r r) (p -.- V2 r r)

src/Dodge/Zoning/Creature.hs

@@ -34,7 +34,7 @@ crsNearCirc :: Point2 -> Float -> World -> [Creature]
 crsNearCirc p r w = mapMaybe (\cid -> w ^? cWorld . lWorld . creatures . ix cid) . IS.toList $ crIXsNearCirc p r w
 
 crsNearRect :: Point2 -> Point2 -> World -> IS.IntSet
-crsNearRect sp ep w = zonesExtract (w ^. cWorld . lWorld . crZoning) $ zoneOfRect crZoneSize sp ep
+crsNearRect = nearRect crZoneSize _crZoning
 
 crZoneSize :: Float
 crZoneSize = 15

src/Dodge/Zoning/Pathing.hs

@@ -1,6 +1,5 @@
 module Dodge.Zoning.Pathing where
 
-import Control.Lens
 import Data.Foldable
 import Dodge.Data.World
 import Dodge.Zoning.Base
@@ -8,15 +7,16 @@ import Geometry
 import qualified IntMapHelp as IM
 import Data.Set (Set)
 import qualified Data.Set as Set
+import Dodge.Zoning.Common
 
 pnsNearPoint :: Point2 -> World -> [(Int, Point2)]
-pnsNearPoint p w = zoneExtract (zoneOfPoint pnZoneSize p) (w ^. cWorld . lWorld . pnZoning)
+pnsNearPoint = nearPoint pnZoneSize _pnZoning
 
 pnsNearSeg :: Point2 -> Point2 -> World -> [(Int, Point2)]
-pnsNearSeg sp ep w = zonesExtract (w ^. cWorld . lWorld . pnZoning) (zoneOfSeg pnZoneSize sp ep)
+pnsNearSeg = nearSeg pnZoneSize _pnZoning
 
 pnsNearRect :: Point2 -> Point2 -> World -> [(Int, Point2)]
-pnsNearRect sp ep w = zonesExtract (w ^. cWorld . lWorld . pnZoning) $ zoneOfRect pnZoneSize sp ep
+pnsNearRect = nearRect pnZoneSize _pnZoning
 
 pnsNearCirc :: Point2 -> Float -> World -> [(Int, Point2)]
 pnsNearCirc p r = pnsNearRect (p +.+ V2 r r) (p -.- V2 r r)
@@ -31,13 +31,14 @@ zonePn :: (Int, Point2) -> IM.IntMap (IM.IntMap [(Int, Point2)]) -> IM.IntMap (I
 zonePn pn = zoneMonoid (zoneOfPn pn) [pn]
 
 pesNearPoint :: Point2 -> World -> Set PathEdgeNodes
-pesNearPoint p w = zoneExtract (zoneOfPoint peZoneSize p) (w ^. cWorld . lWorld . peZoning)
+pesNearPoint = nearPoint peZoneSize _peZoning
+--pesNearPoint p w = zoneExtract (zoneOfPoint peZoneSize p) (w ^. cWorld . lWorld . peZoning)
 
 pesNearSeg :: Point2 -> Point2 -> World -> Set PathEdgeNodes
-pesNearSeg sp ep w = zonesExtract (w ^. cWorld . lWorld . peZoning) (zoneOfSeg peZoneSize sp ep)
+pesNearSeg = nearSeg peZoneSize _peZoning
 
 pesNearRect :: Point2 -> Point2 -> World -> Set PathEdgeNodes
-pesNearRect sp ep w = zonesExtract (w ^. cWorld . lWorld . peZoning) $ zoneOfRect peZoneSize sp ep
+pesNearRect = nearRect peZoneSize _peZoning
 
 pesNearCirc :: Point2 -> Float -> World -> Set PathEdgeNodes
 pesNearCirc p r = pesNearRect (p +.+ V2 r r) (p -.- V2 r r)

src/Dodge/Zoning/Wall.hs

@@ -8,16 +8,18 @@ import Dodge.Zoning.Base
 import FoldableHelp
 import Geometry
 import qualified IntMapHelp as IM
+import Dodge.Zoning.Common
 
 wlIXsNearPoint :: Point2 -> World -> IS.IntSet
-wlIXsNearPoint p w = zoneExtract (zoneOfPoint wlZoneSize p) (w ^. cWorld . lWorld . wlZoning)
+wlIXsNearPoint = nearPoint wlZoneSize _wlZoning
+--wlIXsNearPoint p w = zoneExtract (zoneOfPoint wlZoneSize p) (w ^. cWorld . lWorld . wlZoning)
 
 wlIXsNearSeg :: Point2 -> Point2 -> World -> IS.IntSet
 {-# INLINE wlIXsNearSeg #-}
-wlIXsNearSeg sp ep w = zonesExtract (w ^. cWorld . lWorld . wlZoning) (zoneOfSeg wlZoneSize sp ep)
+wlIXsNearSeg = nearSeg wlZoneSize _wlZoning
 
 wlIXsNearRect :: Point2 -> Point2 -> World -> IS.IntSet
-wlIXsNearRect sp ep w = zonesExtract (w ^. cWorld . lWorld . wlZoning) $ zoneOfRect wlZoneSize sp ep
+wlIXsNearRect = nearRect wlZoneSize _wlZoning
 
 wlIXsNearCirc :: Point2 -> Float -> World -> IS.IntSet
 wlIXsNearCirc p r = wlIXsNearRect (p +.+ V2 r r) (p -.- V2 r r)

src/Dodge/Zoning/World.hs

@@ -4,8 +4,8 @@ import Dodge.Data.World
 import Geometry.Data
 import Control.Lens
 
-zoneOfSight' :: Float -> World -> [Int2]
-zoneOfSight' s w =
+zoneOfSight :: Float -> World -> [Int2]
+zoneOfSight s w =
     [ V2 a b
     | a <- [minimum xs .. maximum xs]
     , b <- [minimum ys .. maximum ys]