diff --git a/src/Dodge/Data.hs b/src/Dodge/Data.hs index aefecead1..e0e9c1e07 100644 --- a/src/Dodge/Data.hs +++ b/src/Dodge/Data.hs @@ -54,7 +54,6 @@ data World = World , _cloudsZone :: IM.IntMap (IM.IntMap (IM.IntMap Cloud)) , _particles :: IM.IntMap Particle , _particles' :: ![Particle'] - , _afterParticles' :: ![Particle'] , _smoke :: [Smoke] , _walls :: !(IM.IntMap Wall) , _wallsZone :: (IM.IntMap (IM.IntMap (IM.IntMap Wall))) diff --git a/src/Dodge/Prototypes.hs b/src/Dodge/Prototypes.hs index dbb65683b..0c1276ea7 100644 --- a/src/Dodge/Prototypes.hs +++ b/src/Dodge/Prototypes.hs @@ -192,7 +192,6 @@ basicWorld = World , _itemPositions = IM.empty , _particles = IM.empty , _particles' = [] - , _afterParticles' = [] , _walls = IM.empty , _wallsZone = IM.empty , _forceFields = IM.empty diff --git a/src/Dodge/Rendering.hs b/src/Dodge/Rendering.hs index cf7f0eb23..7cf2cc800 100644 --- a/src/Dodge/Rendering.hs +++ b/src/Dodge/Rendering.hs @@ -43,7 +43,6 @@ worldPictures w , map clDraw . IM.elems $ _clouds w , map btDraw (IM.elems (_buttons w)) , map _ptPict' $ _particles' w - , map _ptPict' $ _afterParticles' w , map drawWallFloor (wallFloorsToDraw w) -- , map (drawWallFace w) (wallShadowsToDraw w) , map (drawSmokeShadow w) $ _smoke w diff --git a/src/Dodge/Update.hs b/src/Dodge/Update.hs index e1c1e4f20..df1e96558 100644 --- a/src/Dodge/Update.hs +++ b/src/Dodge/Update.hs @@ -43,7 +43,6 @@ update w $ set worldEvents id $ _worldEvents w1 w1 w3 = updateCamera - $ updateAfterParticles' $ colCrsWalls w2 in checkEndGame $ ppEvents w3 @@ -79,10 +78,6 @@ updateParticles' :: World -> World updateParticles' w = set particles' (catMaybes ps) w' where (w',ps) = mapAccumR (\a b -> _ptUpdate' b a b) w $ _particles' w -updateAfterParticles' :: World -> World -updateAfterParticles' w = set afterParticles' (catMaybes ps) w' - where (w',ps) = mapAccumR (\a b -> _ptUpdate' b a b) w $ _afterParticles' w - updateCreatures :: World -> World updateCreatures w = f $ set randGen newG $ set creatures (IM.mapMaybe id crs) w where ((f,newG),crs) = IM.mapAccum (\g' cr -> _crUpdate cr w g' cr) (id,_randGen w) $ _creatures w diff --git a/src/Dodge/WorldActions/Flash.hs b/src/Dodge/WorldActions/Flash.hs index a47465cc3..5720ae40a 100644 --- a/src/Dodge/WorldActions/Flash.hs +++ b/src/Dodge/WorldActions/Flash.hs @@ -117,7 +117,7 @@ lowLightWidthHit len wdth col alphay a b w ((p, E3x2 wall):_) -> over particles' ((:) (wallGlareWidth len wdth col alphay p wall)) w ((p, E3x1 cr):_) - -> over afterParticles' ((:) (crGlareWidth wdth col alphay p cr)) w + -> over particles' ((:) (crGlareWidth wdth col alphay p cr)) w _ -> w