Cleanup

src/Dodge/Zoning/Creature.hs

@@ -12,7 +12,7 @@ import Dodge.Zoning.Common
 
 crIXsNearPoint :: Point2 -> World -> IS.IntSet
 --crIXsNearPoint p w = zoneExtract (zoneOfPoint crZoneSize p) (w ^. cWorld . lWorld . crZoning)
-crIXsNearPoint = nearPoint' crZoneSize _crZoning
+crIXsNearPoint = nearPoint crZoneSize _crZoning
 
 crsNearPoint :: Point2 -> World -> [Creature]
 crsNearPoint p w = mapMaybe (\cid -> w ^? cWorld . lWorld . creatures . ix cid) . IS.toList $ crIXsNearPoint p w
@@ -24,7 +24,7 @@ crsNearSeg sp ep w =
     $ crixsNearSeg sp ep w
 
 crixsNearSeg :: Point2 -> Point2 -> World -> IS.IntSet
-crixsNearSeg = nearSeg' crZoneSize _crZoning
+crixsNearSeg = nearSeg crZoneSize _crZoning
 --crixsNearSeg sp ep w = zonesExtract (w ^. cWorld . lWorld . crZoning) (zoneOfSeg crZoneSize sp ep)
 
 crIXsNearCirc :: Point2 -> Float -> World -> IS.IntSet
@@ -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 = nearRect' crZoneSize _crZoning
+crsNearRect = nearRect crZoneSize _crZoning
 
 crZoneSize :: Float
 crZoneSize = 15
@@ -50,6 +50,7 @@ minCrIXOn f is w = fst <$> IS.foldl' g Nothing is
     h cr = (cr, f cr)
 
 zoneCreature :: Creature -> IM.IntMap (IM.IntMap IS.IntSet) -> IM.IntMap (IM.IntMap IS.IntSet)
+{-# INLINE zoneCreature #-}
 zoneCreature cr im = foldl' f im (zoneOfCr cr)
   where
     f im' i2 = zoneMonoid i2 (IS.singleton $ _crID cr) im'