Hlinting

src/Dodge/Data.hs

@@ -57,7 +57,7 @@ data World = World
     , _clouds               :: IM.IntMap Cloud
     , _cloudsZone           :: IM.IntMap (IM.IntMap (IM.IntMap Cloud))
     , _projectiles          :: IM.IntMap Projectile
-    , _particles'           :: ![Particle']
+    , _particles            :: ![Particle]
     , _walls                :: !(IM.IntMap Wall)
     , _wallsZone            :: (IM.IntMap (IM.IntMap (IM.IntMap Wall)))
     , _forceFields          :: IM.IntMap ForceField
@@ -374,14 +374,18 @@ data ItemIdentity
     | PoisonSprayer
     deriving (Eq,Show,Ord,Enum)
 
-data Particle' 
-    = Particle' 
-        { _ptDraw :: Particle' -> Picture
-        , _ptUpdate' :: World -> Particle' -> (World, Maybe Particle')
+{-
+Objects without ids.
+Update themselves, perhaps with side effects.
+ -}
+data Particle
+    = Particle
+        { _ptDraw :: Particle -> Picture
+        , _ptUpdate' :: World -> Particle -> (World, Maybe Particle)
         }
     | Bul'  
-        { _ptDraw :: Particle' -> Picture
-        , _ptUpdate' :: World -> Particle' -> (World, Maybe Particle')
+        { _ptDraw :: Particle -> Picture
+        , _ptUpdate' :: World -> Particle -> (World, Maybe Particle)
         , _btVel' :: Point2
         , _btColor' :: Color
         , _btTrail' :: [Point2]
@@ -391,8 +395,8 @@ data Particle'
         , _btHitEffect' :: HitEffect
         }
     | Pt'  
-        { _ptDraw :: Particle' -> Picture
-        , _ptUpdate' :: World -> Particle' -> (World, Maybe Particle')
+        { _ptDraw :: Particle -> Picture
+        , _ptUpdate' :: World -> Particle -> (World, Maybe Particle)
         , _btVel' :: Point2
         , _btColor' :: Color
         , _btPos' :: Point2
@@ -402,8 +406,8 @@ data Particle'
         , _btHitEffect' :: HitEffect
         }
     | Shockwave' 
-        { _ptDraw       :: Particle' -> Picture
-        , _ptUpdate'    :: World -> Particle' -> (World, Maybe Particle')
+        { _ptDraw       :: Particle -> Picture
+        , _ptUpdate'    :: World -> Particle -> (World, Maybe Particle)
         , _btColor'     :: Color
         , _btPos'       :: Point2
         , _btRad'       :: Float
@@ -413,8 +417,8 @@ data Particle'
         , _btTimer'     :: Int
         }
 
-type HitEffect = Particle' -> [(Point2, (Either3 Creature Wall ForceField))] -> World 
-                    -> (World,Maybe Particle')
+type HitEffect = Particle -> [(Point2, (Either3 Creature Wall ForceField))] -> World 
+                    -> (World,Maybe Particle)
 
 data Projectile 
     = Projectile    
@@ -500,7 +504,7 @@ makeLenses ''ItAttachment
 makeLenses ''ItZoom
 makeLenses ''FloorItem
 makeLenses ''Projectile
-makeLenses ''Particle'
+makeLenses ''Particle
 makeLenses ''Wall
 makeLenses ''ForceField
 makeLenses ''FFState