Move zoning up world spheres

src/Dodge/Update.hs

@@ -202,7 +202,6 @@ functionalUpdate w =
         . over uvWorld ppEvents
         . colCrsWalls
         . over uvWorld simpleCrSprings
-        . over uvWorld zoneCreatures
         . over uvWorld (updateIMl (_doors . _lWorld . _cWorld) (doDrWdWd . _drMech))
         . over uvWorld doWorldEvents
         . over uvWorld updateDelayedEvents
@@ -226,7 +225,6 @@ functionalUpdate w =
         . over uvWorld updateLightSources
         . over uvWorld updateClouds
         . over uvWorld updateGusts
-        . over uvWorld zoneClouds
         . over uvWorld (updateMIM (cWorld . lWorld . magnets) (doMagnetUpdate . _mgUpdate))
         . over uvWorld (updateIMl' (_terminals . _lWorld . _cWorld) tmUpdate)
         --    . updateIMl _machines mcChooseUpdate
@@ -241,6 +239,8 @@ functionalUpdate w =
         . over uvWorld updateRBList
         . over uvWorld updateCloseObjects
         . over uvWorld updateWheelEvents
+        . over uvWorld zoneClouds
+        . over uvWorld zoneCreatures
         -- . over uvWorld updateInventorySelectionList
         $ over (uvWorld . cWorld) updatePastWorlds w
 
@@ -278,11 +278,7 @@ updateLasers w =
     (w', ls) = mapAccumR updateLaser w (w ^. cWorld . lWorld . lasers)
 
 zoneClouds :: World -> World
-zoneClouds w =
-    w
-        & cWorld . lWorld . clZoning .~ mempty
-        & cWorld . lWorld . clZoning %~ \zn ->
-            foldl' (flip zoneCloud) zn (w ^. cWorld . lWorld . clouds)
+zoneClouds w = w & clZoning .~ foldl' (flip zoneCloud) mempty (w ^. cWorld . lWorld . clouds)
 
 updateWorldSelect' :: World -> World
 updateWorldSelect' w = over input (updateWorldSelect (w ^. cWorld . camPos)) w
@@ -358,7 +354,7 @@ setOldPos cr =
 --    Nothing' -> w & timeFlow .~ NormalTimeFlow
 
 zoneCreatures :: World -> World
-zoneCreatures w = w & cWorld . lWorld . crZoning 
+zoneCreatures w = w & crZoning 
     .~ foldl' (flip zoneCreature) mempty (w ^. cWorld . lWorld . creatures)
 
 --        foldl' (flip $ updateZoning (\cr -> IM.insert (_crID cr) cr))