Cleanup

2021-12-15 22:21:58 +00:00
parent 9dadea2c36
commit 9ead5b3979
11 changed files with 130 additions and 174 deletions
@@ -460,13 +460,13 @@ data Particle
        , _ptTimer :: Int
        , _ptColor :: Color
        }
-    | BulletPt  
+    | BulletPt
        { _ptDraw   :: Particle -> Picture
        , _ptUpdate :: World -> Particle -> (World, Maybe Particle)
        , _ptVel    :: Point2
        , _btDrag   :: Float
-        , _btColor' :: Color
-        , _btTrail' :: [Point2]
+        , _ptColor  :: Color
+        , _ptTrail  :: [Point2]
        , _btPassThrough' :: Maybe Int
        , _btWidth' :: Float 
        , _btTimer' :: Int
@@ -476,7 +476,7 @@ data Particle
        { _ptDraw :: Particle -> Picture
        , _ptUpdate :: World -> Particle -> (World, Maybe Particle)
        , _ptVel    :: Point2
-        , _btColor' :: Color
+        , _ptColor  :: Color
        , _btPos' :: Point2
        , _btPassThrough' :: Maybe Int
        , _btWidth' :: Float 
@@ -484,10 +484,10 @@ data Particle
        , _btHitEffect' :: HitEffect
        , _ptZ :: Float
        }
-    | Shockwave' 
+    | Shockwave
        { _ptDraw       :: Particle -> Picture
        , _ptUpdate    :: World -> Particle -> (World, Maybe Particle)
-        , _btColor'     :: Color
+        , _ptColor      :: Color
        , _btPos'       :: Point2
        , _btRad'       :: Float
        , _btDam'       :: Int