Move flares into own grouping

src/Dodge/Data.hs

@@ -11,6 +11,7 @@ circular imports are probably not a good idea.
 module Dodge.Data 
     ( module Dodge.Data
     , module Dodge.Data.Material
+    , module Dodge.Data.Flare
     , module Dodge.Data.LoadAction
     , module Dodge.Data.ForegroundShape
     , module Dodge.Data.Wall
@@ -37,6 +38,7 @@ module Dodge.Data
     ) where
 import Dodge.Data.RadarBlip
 import Dodge.Data.Room
+import Dodge.Data.Flare
 import Dodge.Data.PathGraph
 import Dodge.Data.Zoning
 import Dodge.Data.ForegroundShape
@@ -122,6 +124,7 @@ data World = World
     , _instantParticles     :: [Particle]
     , _particles            :: [Particle]
     , _radarBlips           :: [RadarBlip]
+    , _flares               :: [Flare]
     , _newBeams             :: WorldBeams
     , _beams                :: WorldBeams
     , _walls                :: IM.IntMap Wall
@@ -635,10 +638,6 @@ data BeamType
 {- Objects without ids.
 Update themselves, perhaps with side effects.  -}
 data Particle
---    = Particle
---        { _ptDraw   :: Particle -> Picture
---        , _ptUpdate :: World -> Particle -> (World, Maybe Particle)
---        }
     = RadarCircleParticle
         { _ptUpdate :: World -> Particle -> (World, Maybe Particle)
         , _ptTimer  :: Int
@@ -665,12 +664,6 @@ data Particle
         , _ptPoints :: [Point2]
         , _ptColor  :: Color
         }
---    | LinearParticle 
---        { _ptUpdate :: World -> Particle -> (World, Maybe Particle)
---        , _ptPoints :: [Point2]
---        , _ptTimer :: Int
---        , _ptColor :: Color
---        }
     | BulletPt
         { _ptUpdate :: World -> Particle -> (World, Maybe Particle)
         , _ptVel    :: Point2
@@ -717,30 +710,6 @@ data Particle
         , _ptHitEff :: HitEffect
         , _ptZ :: Float
         }
-    | PtMuzFlare 
-        { _ptUpdate :: World -> Particle -> (World, Maybe Particle)
-        , _ptPoly   :: [Point2]
-        , _ptColor  :: Color
-        , _ptTran3  :: Point3
-        }
-    | PtCircFlare 
-        { _ptUpdate :: World -> Particle -> (World, Maybe Particle)
-        , _ptColor  :: Color
-        , _ptAlpha  :: Float
-        , _ptTran3  :: Point3
-        }
---    | PtZ  
---        { _ptDraw :: Particle -> Picture
---        , _ptUpdate :: World -> Particle -> (World, Maybe Particle)
---        , _ptVel    :: Point2
---        , _ptColor  :: Color
---        , _ptPos :: Point2
---        , _ptCrIgnore :: Maybe Int
---        , _ptWidth :: Float 
---        , _ptTimer :: Int
---        , _ptHitEff :: HitEffect
---        , _ptZ :: Float
---        }
     | Shockwave
         { _ptUpdate     :: World -> Particle -> (World, Maybe Particle)
         , _ptColor      :: Color