Cleanup

src/Dodge/Data.hs

@@ -53,6 +53,8 @@ import qualified Data.IntMap.Strict as IM
 import qualified Data.Map.Strict as M
 import SDL (Scancode, MouseButton)
 type CRUpdate = Creature -> World -> (World -> World, Maybe Creature)
+type CRUpdate' = Creature -> World -> (World -> World, Creature)
+
 data Universe = Universe
     { _uvWorld :: World
     , _preloadData          :: PreloadData
@@ -78,7 +80,7 @@ data World = World
     , _props                :: IM.IntMap Prop
     , _instantParticles     :: [Particle]
     , _particles            :: [Particle]
-    , _walls                :: (IM.IntMap Wall)
+    , _walls                :: IM.IntMap Wall
     , _doors                :: IM.IntMap Door
     , _machines             :: IM.IntMap Machine
     , _magnets              :: IM.IntMap Magnet
@@ -109,7 +111,7 @@ data World = World
     , _carteCenter          :: Point2
     , _carteZoom            :: Float
     , _carteRot             :: Float
-    , _lightSources         :: (IM.IntMap LightSource)
+    , _lightSources         :: IM.IntMap LightSource
     , _tempLightSources     :: [TempLightSource]
     , _closeObjects         :: [Either FloorItem Button]
     , _seenLocations        :: IM.IntMap (World -> Point2,String)