Revert mouse input changes to occur during your creature evaluation
This commit is contained in:
+3
-1
@@ -10,6 +10,8 @@ import Dodge.RandomHelp
|
|||||||
import Dodge.WorldEvent
|
import Dodge.WorldEvent
|
||||||
import Dodge.CreatureState
|
import Dodge.CreatureState
|
||||||
|
|
||||||
|
import Dodge.Update.UsingInput
|
||||||
|
|
||||||
import Geometry
|
import Geometry
|
||||||
import Picture
|
import Picture
|
||||||
|
|
||||||
@@ -1871,7 +1873,7 @@ splitCritCorpse x = color (greyN 0.2) $ circleSolid x
|
|||||||
spCrRadFac = 8^2
|
spCrRadFac = 8^2
|
||||||
|
|
||||||
yourControl :: World -> (World -> World,StdGen) -> Creature -> ((World -> World,StdGen), Maybe Creature)
|
yourControl :: World -> (World -> World,StdGen) -> Creature -> ((World -> World,StdGen), Maybe Creature)
|
||||||
yourControl w (f,g) cr = ( (f, g)
|
yourControl w (f,g) cr = ( (updateUsingInput . f, g)
|
||||||
, Just . crAutoReload . mouseActionsCr (_mouseButtons w) $ wasdWithAiming w speed strafeSpeed 0 cr
|
, Just . crAutoReload . mouseActionsCr (_mouseButtons w) $ wasdWithAiming w speed strafeSpeed 0 cr
|
||||||
)
|
)
|
||||||
where strafeSpeed = 8 * equipFactor * (fromMaybe 1 $ yourItem w ^? itAimingSpeed)
|
where strafeSpeed = 8 * equipFactor * (fromMaybe 1 $ yourItem w ^? itAimingSpeed)
|
||||||
|
|||||||
+1
-1
@@ -35,7 +35,7 @@ update w
|
|||||||
. updateBlocks -- . zoning
|
. updateBlocks -- . zoning
|
||||||
. updateSeenWalls
|
. updateSeenWalls
|
||||||
. updateSoundQueue
|
. updateSoundQueue
|
||||||
. updateUsingInput
|
-- . updateUsingInput
|
||||||
$ updateCloseObjects w
|
$ updateCloseObjects w
|
||||||
in checkEndGame . ppEvents
|
in checkEndGame . ppEvents
|
||||||
. updateCamera
|
. updateCamera
|
||||||
|
|||||||
Reference in New Issue
Block a user