From 7ef4e5d415854c32aa18df99832a9385533f8be7 Mon Sep 17 00:00:00 2001 From: jgk Date: Fri, 26 Mar 2021 17:35:29 +0100 Subject: [PATCH] Revert mouse input changes to occur during your creature evaluation --- src/Dodge/AIs.hs | 4 +++- src/Dodge/Update.hs | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/Dodge/AIs.hs b/src/Dodge/AIs.hs index 85f41cfa9..284e277f9 100644 --- a/src/Dodge/AIs.hs +++ b/src/Dodge/AIs.hs @@ -10,6 +10,8 @@ import Dodge.RandomHelp import Dodge.WorldEvent import Dodge.CreatureState +import Dodge.Update.UsingInput + import Geometry import Picture @@ -1871,7 +1873,7 @@ splitCritCorpse x = color (greyN 0.2) $ circleSolid x spCrRadFac = 8^2 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 ) where strafeSpeed = 8 * equipFactor * (fromMaybe 1 $ yourItem w ^? itAimingSpeed) diff --git a/src/Dodge/Update.hs b/src/Dodge/Update.hs index 1ca6d8078..1779d8c6f 100644 --- a/src/Dodge/Update.hs +++ b/src/Dodge/Update.hs @@ -35,7 +35,7 @@ update w . updateBlocks -- . zoning . updateSeenWalls . updateSoundQueue - . updateUsingInput +-- . updateUsingInput $ updateCloseObjects w in checkEndGame . ppEvents . updateCamera