Cleanup, split CWorld into separate file

src/Dodge/Render/HUD.hs

@@ -141,7 +141,7 @@ subInventoryDisplay subinv cfig w = case subinv of
     equipcursors = IM.foldMapWithKey (f yellow) (_crInvEquipped cr)
     f col invid epos = listTextPictureAt 144 0 cfig (selNumPos invid w) . color col $ text $ eqPosText epos
     rboptions = if ButtonRight `M.member` _mouseButtons w
-        then drawRBOptions cfig w (_rbOptions (_cWorld w))
+        then drawRBOptions cfig w (_rbOptions w)
         else mempty
 
 itmInfo :: Maybe Item -> [String]
@@ -187,7 +187,7 @@ drawRBOptions cfig w EquipOptions{_opEquip = es,_opSel=i, _opAllocateEquipment=a
   where
     midtext str = listTextPictureAt 252 0 cfig curpos (text str)
     extratext str = listTextPictureAt 432 0 cfig curpos (text (str ++ deactivatetext))
-    deactivatetext = case w ^? cWorld . rbOptions . opActivateEquipment . deactivateEquipment of
+    deactivatetext = case w ^? rbOptions . opActivateEquipment . deactivateEquipment of
         Just k -> " DEACTIVATES " ++ show (_iyBase $ _itType (_crInv (you w) IM.! k))
         Nothing -> ""
     curpos = invSelPos w
@@ -255,7 +255,7 @@ topCursorTypeWidth ctype width cfig w i
     = ctype 0 0 cfig (selNumPos i w) (selNumCol i w) width (selNumSlots i w)
 
 determineInvSelCursorWidth :: World -> Int
-determineInvSelCursorWidth w = case _rbOptions (_cWorld w) of
+determineInvSelCursorWidth w = case _rbOptions w of
     NoRightButtonOptions -> topInvW
     EquipOptions {} -> if ButtonRight `M.member` _mouseButtons w
         then 47

src/Dodge/Render/ShapePicture.hs

@@ -207,22 +207,22 @@ drawPathBetween w = setLayer DebugLayer
   where
     nodepos = (`getNodePos` w)
     nodelist = makePathBetween sp ep w
-    sp = _lSelect (_cWorld w)
-    ep = _rSelect (_cWorld w)
+    sp = _lSelect w
+    ep = _rSelect w
 
 drawNodesNearSelect :: World -> Picture
 drawNodesNearSelect w = setLayer DebugLayer 
     $  runIdentity (S.foldMap_ (drawZoneCol orange pnZoneSize) (zoneAroundPoint pnZoneSize sp))
     <> color green (drawCross sp)
   where
-    sp = _lSelect (_cWorld w)
+    sp = _lSelect w
 
 drawInspectWalls :: World -> Picture
 drawInspectWalls w = foldMap (drawInspectWall w) 
     $ filter (isJust . uncurry (intersectSegSeg a b) . _wlLine)
     $ IM.elems $ _walls (_cWorld w)
   where
-    (a,b) = _lLine (_cWorld w)
+    (a,b) = _lLine w
 
 drawInspectWall :: World -> Wall -> Picture
 drawInspectWall w wl = setLayer DebugLayer
@@ -252,8 +252,8 @@ drawWorldSelect w = setLayer DebugLayer
     $  color cyan (line [a,b])
     <> color magenta (line [c,d])
   where
-    (a,b) = _lLine (_cWorld w)
-    (c,d) = _rLine (_cWorld w)
+    (a,b) = _lLine w
+    (c,d) = _rLine w
 
 drawFarWallDetect :: World -> Picture
 drawFarWallDetect w = setLayer DebugLayer