Fix aiming with no weapon crash
This commit is contained in:
+13
-2
@@ -17,14 +17,14 @@ import Dodge.Update.Camera
|
||||
import Dodge.Inventory
|
||||
import Sound.Data
|
||||
import Geometry
|
||||
import LensHelp
|
||||
|
||||
import Data.List
|
||||
import Data.Maybe
|
||||
import Data.Function
|
||||
--import Data.Function
|
||||
import qualified Data.IntMap.Strict as IM
|
||||
import qualified Data.Map.Strict as M
|
||||
--import qualified Data.Set as S
|
||||
import Control.Lens
|
||||
--import Data.Monoid
|
||||
--import System.Random
|
||||
|
||||
@@ -62,6 +62,7 @@ functionalUpdate cfig w = checkEndGame
|
||||
. updateIMl _props _pjUpdate
|
||||
. updateLightSources
|
||||
. updateClouds
|
||||
. updateGusts
|
||||
. zoneClouds
|
||||
. updateMIM magnets _mgUpdate
|
||||
. updateIMl _machines _mcUpdate
|
||||
@@ -176,6 +177,16 @@ checkEndGame w
|
||||
| _crHP (you w) < 1 = w & sideEffects %~ ( . (menuLayers .~ [gameOverMenu]))
|
||||
| otherwise = w
|
||||
|
||||
updateGusts :: World -> World
|
||||
updateGusts w = w
|
||||
& gusts %~ IM.mapMaybe (mvGust w)
|
||||
|
||||
mvGust :: World -> Gust -> Maybe Gust
|
||||
mvGust _ gu
|
||||
| _guTime gu < 0 = Nothing
|
||||
| otherwise = Just $ gu
|
||||
& guPos .+.+~ _guVel gu
|
||||
& guTime -~ 1
|
||||
updateClouds :: World -> World
|
||||
updateClouds w = w' & clouds .~ catMaybes mclouds
|
||||
where
|
||||
|
||||
Reference in New Issue
Block a user