Cleanup

src/Dodge/Creature/Damage.hs

@@ -40,10 +40,6 @@ applyDamageEffect dm de cr w = case de of
         & creatures . ix (_crID cr) . crPos .+.+~ (pback/_crMass cr) *.* (_dmTo dm -.- fromDir)
     TorqueDamage rot -> w
         & creatures . ix (_crID cr) . crDir +~ rot
---    DamageSpawn f -> w & instantParticles .:~ thepart
---        & randGen .~ g
---      where
---        (thepart,g) = runState (f (Left cr) dm) $ _randGen w
     NoDamageEffect -> w
   where
     fromDir = _dmFrom dm

src/Dodge/Flame.hs

@@ -46,7 +46,7 @@ expireAndDamageFL :: (Flame -> Point2 -> [Damage])
     -> World
     -> (World, Maybe Flame)
 expireAndDamageFL fdm bt things w = case runIdentity $ S.head_ things of
-    Nothing -> (w, mvFlame bt)
+    Nothing -> (w, Just $ bt & flTimer -~ 1)
     Just x -> (doDamagesFL fdm x bt w, Nothing)
 doDamagesFL :: (Flame -> Point2 -> [Damage])
     -> (Point2, Either Creature Wall)
@@ -110,10 +110,6 @@ flDamageInArea crt wlt pt w = damwls damcrs
         $ wlsNearPoint p w'
     hiteff = expireAndDamageFL (simpleDamFL FLAMING 1) pt
 
-mvFlame :: Flame -> Maybe Flame
-mvFlame pt = Just $ pt
-    & flTimer -~ 1
-
 flFlicker :: Flame -> World -> World
 flFlicker pt 
     | _flTimer pt `mod` 7 == 0 = tempLightSources 

src/Dodge/Particle/Update.hs

@@ -1,14 +0,0 @@
-module Dodge.Particle.Update where
-import Dodge.Data
-import LensHelp
-
-mvPt' :: Particle -> Maybe Particle
-mvPt' pt = Just $ pt
-    & ptTimer -~ 1
-
-killParticleUpdate :: World -> Particle -> (World,Maybe Particle)
-killParticleUpdate w pt 
-    | _ptTimer pt <= 0 = (w,Nothing)
-    | otherwise = (w
-        , Just $ pt & ptTimer -~ 1
-        )

src/Dodge/Update.hs

@@ -17,13 +17,9 @@ import Dodge.RadarBlip
 import Dodge.Flare
 import Dodge.Menu
 import Dodge.CullBox
---import Dodge.Block
 import Dodge.Distortion
 import Dodge.SoundLogic
---import Dodge.Wall.Delete
 import Dodge.Update.WallDamage
---import Dodge.Machine.Destroy
---import Dodge.Menu
 import Dodge.Base
 import Dodge.Zone
 import Dodge.Hammer
@@ -35,20 +31,13 @@ import Geometry
 import LensHelp
 import FoldableHelp
 
---import qualified Data.Text as T
---import System.Random
 import Data.List
 import Data.Maybe
---import Data.Function
 import qualified Data.IntMap.Strict as IM
 import qualified Data.Map.Strict as M
 import Control.Applicative
---import qualified Data.Set as S
---import Data.Monoid
---import System.Random
 import qualified Streaming.Prelude as S
 import SDL
---import Streaming
 
 {- For most menus the only way to change the world is using event handling.  -}
 updateUniverse :: Universe -> Universe