diff --git a/src/Dodge/Update/Input/InGame.hs b/src/Dodge/Update/Input/InGame.hs index fd7c9e816..21ac3b458 100644 --- a/src/Dodge/Update/Input/InGame.hs +++ b/src/Dodge/Update/Input/InGame.hs @@ -191,6 +191,7 @@ updateMouseClickInGame cfig w = case w ^. input . mouseContext of OverCombFilter -> w & hud . hudElement . subInventory . ciFilter .~ Nothing & worldEventFlags . at CombineInventoryChange ?~ () + & hud . hudElement . subInventory . ciSelection %~ endCombineRegex w OverCombCombine x -> w & tryCombine x @@ -232,6 +233,17 @@ endRegex i w = fromMaybe id $ do return k return $ ssSetCursor (ssLookupDown i j) sss +endCombineRegex ::World + -> Maybe (Int,Int,IS.IntSet) + -> Maybe (Int,Int,IS.IntSet) +endCombineRegex w = fromMaybe id $ do + sss <- w ^? hud . hudElement . subInventory . ciSections + let j = fromMaybe 0 $ do + itms <- sss ^? ix 0 . ssItems + (k,_) <- IM.lookupMin itms + return (k-1) + return $ ssSetCursor (ssLookupDown 0 j) sss + startDrag :: (Int, Int) -> Configuration -> World -> World startDrag (a, b) cfig w = setcontext . fromMaybe (augInvDirectSelect (a, b, IS.singleton b) w) $ do diff --git a/tags b/tags index 91e9c2a0a..37084aebc 100644 --- a/tags +++ b/tags @@ -1341,11 +1341,11 @@ Outline src/Dodge/Render/Outline.hs 1;" m OutwardShockwave src/Dodge/Data/Shockwave.hs 14;" C OverCombCombine src/Dodge/Data/Input.hs 34;" C OverCombEscape src/Dodge/Data/Input.hs 36;" C +OverCombFiltInv src/Dodge/Data/Input.hs 32;" C OverCombFilter src/Dodge/Data/Input.hs 35;" C OverCombSelect src/Dodge/Data/Input.hs 33;" C OverInvDrag src/Dodge/Data/Input.hs 25;" C OverInvDragSelect src/Dodge/Data/Input.hs 30;" C -OverInvFilt src/Dodge/Data/Input.hs 32;" C OverInvSelect src/Dodge/Data/Input.hs 31;" C OverTerminalEscape src/Dodge/Data/Input.hs 38;" C OverTerminalReturn src/Dodge/Data/Input.hs 37;" C @@ -3317,7 +3317,7 @@ adjustIMZone src/Dodge/Base.hs 77;" f advanceScrollAmount src/Dodge/Update.hs 409;" f advanceSmoothScroll src/Dodge/SmoothScroll.hs 29;" f advanceStepCounter src/Dodge/Creature/Impulse/Movement.hs 45;" f -aimDelaySweep src/Dodge/Render/Picture.hs 235;" f +aimDelaySweep src/Dodge/Render/Picture.hs 239;" f aimStanceInfo src/Dodge/Item/Info.hs 210;" f aimTurn src/Dodge/Creature/YourControl.hs 143;" f aimingMuzzleLength src/Dodge/Creature/HandPos.hs 46;" f @@ -3625,7 +3625,7 @@ colCrsWalls src/Dodge/WallCreatureCollisions.hs 17;" f colSpark src/Dodge/Spark.hs 47;" f colSparkRandDir src/Dodge/Spark.hs 101;" f collectDamageTypes src/Dodge/Damage.hs 32;" f -collectInvItems src/Dodge/Update/Input/InGame.hs 241;" f +collectInvItems src/Dodge/Update/Input/InGame.hs 259;" f collideCircWalls src/Dodge/Base/Collide.hs 149;" f collidePoint src/Dodge/Base/Collide.hs 48;" f collidePointTestFilter src/Dodge/Base/Collide.hs 93;" f @@ -3659,7 +3659,7 @@ composeTree src/Dodge/Tree/Compose.hs 46;" f computerBeepingS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 472;" f conEffects src/Dodge/Concurrent.hs 13;" f concBall src/Dodge/WorldEvent/SpawnParticle.hs 27;" f -concurrentIS src/Dodge/Update/Input/InGame.hs 233;" f +concurrentIS src/Dodge/Update/Input/InGame.hs 251;" f connectItemS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 532;" f connectionBlurb src/Dodge/Terminal.hs 102;" f connectionBlurbLines src/Dodge/Terminal.hs 47;" f @@ -4004,7 +4004,7 @@ doPropUpdates src/Dodge/Prop/Update.hs 36;" f doQuickload src/Dodge/Save.hs 82;" f doQuicksave src/Dodge/Save.hs 77;" f doRandImpulse src/Dodge/RandImpulse.hs 7;" f -doRegexInput src/Dodge/Update/Input/InGame.hs 380;" f +doRegexInput src/Dodge/Update/Input/InGame.hs 398;" f doRoomInPlacements src/Dodge/Layout.hs 97;" f doRoomOutPlacements src/Dodge/Layout.hs 107;" f doRoomPlacements src/Dodge/Layout.hs 122;" f @@ -4056,8 +4056,7 @@ drawButton src/Dodge/Button/Draw.hs 9;" f drawCPUShadows src/Dodge/Render/Shadow.hs 19;" f drawCarte src/Dodge/Render/HUD/Carte.hs 14;" f drawCollisionTest src/Dodge/Debug/Picture.hs 103;" f -drawCombFilter src/Dodge/Render/Picture.hs 216;" f -drawCombFilterJump src/Dodge/Render/Picture.hs 159;" f +drawCombFilter src/Dodge/Render/Picture.hs 220;" f drawCombineInventory src/Dodge/Render/HUD.hs 171;" f drawConcurrentMessage src/Dodge/Render/Picture.hs 62;" f drawCorpse src/Dodge/Corpse/Draw.hs 6;" f @@ -4070,13 +4069,13 @@ drawCursorAt src/Dodge/Render/List.hs 71;" f drawDDATest src/Dodge/Debug/Picture.hs 256;" f drawDoorPaths src/Dodge/Debug/Picture.hs 217;" f drawDoubleLampCover src/Dodge/Prop/Draw.hs 81;" f -drawDrag src/Dodge/Render/Picture.hs 166;" f -drawDragDrop src/Dodge/Render/Picture.hs 177;" f -drawDragPickup src/Dodge/Render/Picture.hs 186;" f -drawDragSelect src/Dodge/Render/Picture.hs 163;" f +drawDrag src/Dodge/Render/Picture.hs 170;" f +drawDragDrop src/Dodge/Render/Picture.hs 181;" f +drawDragPickup src/Dodge/Render/Picture.hs 190;" f +drawDragSelect src/Dodge/Render/Picture.hs 167;" f drawDragSelected src/Dodge/Render/HUD.hs 133;" f drawDragSelecting src/Dodge/Render/HUD.hs 151;" f -drawEmptySet src/Dodge/Render/Picture.hs 114;" f +drawEmptySet src/Dodge/Render/Picture.hs 117;" f drawEnergyBall src/Dodge/EnergyBall/Draw.hs 8;" f drawEquipment src/Dodge/Creature/Picture.hs 140;" f drawExamineInventory src/Dodge/Render/HUD.hs 187;" f @@ -4085,13 +4084,14 @@ drawFlame src/Dodge/Flame/Draw.hs 7;" f drawFlamelet src/Dodge/EnergyBall/Draw.hs 23;" f drawFooterText src/Dodge/Render/MenuScreen.hs 74;" f drawForceField src/Dodge/Wall/Draw.hs 11;" f -drawGapPlus src/Dodge/Render/Picture.hs 226;" f +drawGapPlus src/Dodge/Render/Picture.hs 230;" f drawGib src/Dodge/Prop/Draw.hs 28;" f drawHUD src/Dodge/Render/HUD.hs 47;" f drawInputMenu src/Dodge/Render/MenuScreen.hs 21;" f drawInspectWall src/Dodge/Debug/Picture.hs 209;" f drawInspectWalls src/Dodge/Debug/Picture.hs 197;" f drawInventory src/Dodge/Render/HUD.hs 54;" f +drawJumpDown src/Dodge/Render/Picture.hs 163;" f drawLabCrossCol src/Dodge/Render/Label.hs 8;" f drawLampCover src/Dodge/Prop/Draw.hs 44;" f drawLaser src/Dodge/Laser/Draw.hs 6;" f @@ -4103,8 +4103,8 @@ drawListYgapScaleYoff src/Dodge/Render/List.hs 99;" f drawListYoff src/Dodge/Render/List.hs 96;" f drawMachine src/Dodge/Machine/Draw.hs 17;" f drawMapWall src/Dodge/Render/HUD/Carte.hs 33;" f -drawMenuClick src/Dodge/Render/Picture.hs 134;" f -drawMenuCursor src/Dodge/Render/Picture.hs 147;" f +drawMenuClick src/Dodge/Render/Picture.hs 137;" f +drawMenuCursor src/Dodge/Render/Picture.hs 150;" f drawMenuOrHUD src/Dodge/Render/Picture.hs 57;" f drawMenuScreen src/Dodge/Render/MenuScreen.hs 15;" f drawMouseCursor src/Dodge/Render/Picture.hs 73;" f @@ -4116,7 +4116,7 @@ drawOptions src/Dodge/Render/MenuScreen.hs 35;" f drawPathBetween src/Dodge/Debug/Picture.hs 168;" f drawPathEdge src/Dodge/Debug/Picture.hs 222;" f drawPathing src/Dodge/Debug/Picture.hs 384;" f -drawPlus src/Dodge/Render/Picture.hs 131;" f +drawPlus src/Dodge/Render/Picture.hs 134;" f drawPointLabel src/Dodge/Render/Label.hs 13;" f drawProjectile src/Dodge/Projectile/Draw.hs 13;" f drawProp src/Dodge/Prop/Draw.hs 15;" f @@ -4124,11 +4124,11 @@ drawProp' src/Dodge/Prop/Draw.hs 12;" f drawRBOptions src/Dodge/Render/HUD.hs 240;" f drawRadarSweep src/Dodge/RadarSweep/Draw.hs 7;" f drawRemoteShell src/Dodge/Projectile/Draw.hs 30;" f -drawReturn src/Dodge/Render/Picture.hs 120;" f +drawReturn src/Dodge/Render/Picture.hs 123;" f drawRootCursor src/Dodge/Render/HUD.hs 71;" f drawSSCursor src/Dodge/SelectionSections/Draw.hs 31;" f drawSSMultiCursor src/Dodge/SelectionSections/Draw.hs 42;" f -drawSelect src/Dodge/Render/Picture.hs 205;" f +drawSelect src/Dodge/Render/Picture.hs 209;" f drawSelectionList src/Dodge/Render/List.hs 35;" f drawSelectionListBackground src/Dodge/Render/List.hs 51;" f drawSelectionSections src/Dodge/SelectionSections/Draw.hs 17;" f @@ -4141,7 +4141,7 @@ drawShockwave src/Dodge/Shockwave/Draw.hs 7;" f drawSpark src/Dodge/Spark/Draw.hs 6;" f drawStaticBall src/Dodge/EnergyBall/Draw.hs 14;" f drawSubInventory src/Dodge/Render/HUD.hs 163;" f -drawSweep src/Dodge/Render/Picture.hs 242;" f +drawSweep src/Dodge/Render/Picture.hs 246;" f drawSwitch src/Dodge/Button/Draw.hs 15;" f drawSwitchWire src/Dodge/LevelGen/Switch.hs 28;" f drawTargeting src/Dodge/Targeting/Draw.hs 13;" f @@ -4190,6 +4190,7 @@ encircle src/Dodge/Creature/Boid.hs 115;" f encircleCloseP src/Dodge/Creature/Boid.hs 35;" f encircleDistP src/Dodge/Creature/Boid.hs 21;" f encircleP src/Dodge/Creature/Boid.hs 27;" f +endRegex src/Dodge/Update/Input/InGame.hs 224;" f enterCombineInv src/Dodge/DisplayInventory.hs 343;" f eqConstr src/SameConstr.hs 17;" f eqPosText src/Dodge/Equipment/Text.hs 6;" f @@ -4484,7 +4485,7 @@ ildtPropagate src/Dodge/DoubleTree.hs 57;" f impulsiveAIBefore src/Dodge/Creature/Impulse.hs 22;" f inLink src/Dodge/RoomLink.hs 113;" f inSegArea src/Geometry/Intersect.hs 298;" f -inTextInputFocus src/Dodge/InputFocus.hs 12;" f +inTextInputFocus src/Dodge/InputFocus.hs 10;" f incBallAt src/Dodge/EnergyBall.hs 54;" f incidenceToFunction src/Dodge/Graph.hs 26;" f indefiniteExceptions src/StringHelp.hs 29;" f @@ -4511,7 +4512,7 @@ initializeOptionMenu src/Dodge/Menu/Option.hs 17;" f initializeOptionMenuBO src/Dodge/Menu/Option.hs 33;" f initializeTexture2D src/Framebuffer/Update.hs 221;" f inorderNumberTree src/TreeHelp.hs 189;" f -inputFocusI src/Dodge/InputFocus.hs 15;" f +inputFocusI src/Dodge/InputFocus.hs 13;" f insertAt src/Padding.hs 60;" f insertIMInZone src/Dodge/Base.hs 59;" f insertInTrie src/SimpleTrie.hs 23;" f @@ -4547,7 +4548,7 @@ invAdj src/Dodge/Item/Grammar.hs 188;" f invCursorParams src/Dodge/ListDisplayParams.hs 38;" f invDimColor src/Dodge/DisplayInventory.hs 205;" f invDisplayParams src/Dodge/ListDisplayParams.hs 32;" f -invHead src/Dodge/Render/HUD.hs 396;" f +invHead src/Dodge/Render/HUD.hs 397;" f invLDT src/Dodge/Item/Grammar.hs 171;" f invRootMap src/Dodge/Item/Grammar.hs 180;" f invRootTrees src/Dodge/Item/Grammar.hs 210;" f @@ -4722,7 +4723,7 @@ llleft src/Dodge/Item/Grammar.hs 107;" f llright src/Dodge/Item/Grammar.hs 114;" f lmt src/MatrixHelper.hs 43;" f lnkBothAnd src/Dodge/Room/Procedural.hs 121;" f -lnkMidPosInvSelsCol src/Dodge/Render/HUD.hs 385;" f +lnkMidPosInvSelsCol src/Dodge/Render/HUD.hs 386;" f lnkPosDir src/Dodge/RoomLink.hs 97;" f loadDodgeConfig src/Dodge/Config/Load.hs 9;" f loadMusic src/Dodge/SoundLogic/LoadSound.hs 21;" f @@ -4850,7 +4851,7 @@ maybeClearPath src/Dodge/Block.hs 77;" f maybeClearPaths src/Dodge/Block.hs 74;" f maybeDestroyBlock src/Dodge/Wall/Damage.hs 26;" f maybeDestroyDoor src/Dodge/Wall/Damage.hs 31;" f -maybeExitCombine src/Dodge/Update/Input/InGame.hs 556;" f +maybeExitCombine src/Dodge/Update/Input/InGame.hs 575;" f maybeOpenTerminal src/Dodge/Update.hs 124;" f maybeReadFile src/Dodge/LoadSeed.hs 10;" f maybeTakeOne src/RandomHelp.hs 111;" f @@ -5074,7 +5075,7 @@ parseNum src/Dodge/Debug/Terminal.hs 73;" f pathConnected src/Dodge/Room/CheckConsistency.hs 14;" f pathEdgeObstructed src/Dodge/Path.hs 43;" f pauseAndFloatCam src/Dodge/Camera.hs 10;" f -pauseGame src/Dodge/Update/Input/InGame.hs 476;" f +pauseGame src/Dodge/Update/Input/InGame.hs 495;" f pauseMenu src/Dodge/Menu.hs 53;" f pauseMenuOptions src/Dodge/Menu.hs 58;" f pauseSound src/Dodge/SoundLogic.hs 41;" f @@ -5533,12 +5534,12 @@ sectionsSizes src/Dodge/DisplayInventory.hs 222;" f seedStartMenu src/Dodge/Menu.hs 79;" f seedStartOptions src/Dodge/Menu.hs 82;" f segOnCirc src/Geometry.hs 116;" f -selCloseObj src/Dodge/Update/Input/InGame.hs 499;" f -selNumPos src/Dodge/Render/HUD.hs 445;" f -selNumPosCardinal src/Dodge/Render/HUD.hs 468;" f +selCloseObj src/Dodge/Update/Input/InGame.hs 518;" f +selNumPos src/Dodge/Render/HUD.hs 446;" f +selNumPosCardinal src/Dodge/Render/HUD.hs 469;" f selSecDrawCursor src/Dodge/Render/List.hs 130;" f selSecDrawCursorAt src/Dodge/Render/List.hs 108;" f -selSecSelCol src/Dodge/Render/HUD.hs 493;" f +selSecSelCol src/Dodge/Render/HUD.hs 494;" f selSecSelSize src/Dodge/SelectionSections.hs 180;" f selSecYint src/Dodge/SelectionSections.hs 189;" f selectCreatureDebugItem src/Dodge/Debug.hs 39;" f @@ -5578,7 +5579,7 @@ setOutLinks src/Dodge/RoomLink.hs 48;" f setOutLinksByType src/Dodge/RoomLink.hs 57;" f setOutLinksPD src/Dodge/RoomLink.hs 77;" f setRBCreatureTargeting src/Dodge/Creature/State.hs 292;" f -setSelWhileDragging src/Dodge/Update/Input/InGame.hs 276;" f +setSelWhileDragging src/Dodge/Update/Input/InGame.hs 294;" f setSelectionListRestriction src/Dodge/Update/Input/ScreenLayer.hs 85;" f setShaderSource src/Shader/Compile.hs 290;" f setShadowLimits src/Dodge/Shadows.hs 11;" f @@ -5629,9 +5630,9 @@ shiftChildren src/Dodge/Tree/Compose.hs 43;" f shiftDraw src/Dodge/Render/ShapePicture.hs 66;" f shiftDraw' src/Dodge/Render/ShapePicture.hs 72;" f shiftInBy src/Dodge/PlacementSpot.hs 236;" f -shiftInvItems src/Dodge/Update/Input/InGame.hs 251;" f -shiftInvItemsDown src/Dodge/Update/Input/InGame.hs 289;" f -shiftInvItemsUp src/Dodge/Update/Input/InGame.hs 283;" f +shiftInvItems src/Dodge/Update/Input/InGame.hs 269;" f +shiftInvItemsDown src/Dodge/Update/Input/InGame.hs 307;" f +shiftInvItemsUp src/Dodge/Update/Input/InGame.hs 301;" f shiftLinkBy src/Dodge/Room/Link.hs 87;" f shiftPSBy src/Dodge/Placement/Shift.hs 12;" f shiftPathBy src/Dodge/Room/Link.hs 92;" f @@ -5730,7 +5731,7 @@ soundToVol src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 4;" f soundWithStatus src/Dodge/SoundLogic.hs 98;" f soundWithStatusVolume src/Dodge/SoundLogic.hs 48;" f southPillarsRoom src/Dodge/Room/LongDoor.hs 85;" f -spaceAction src/Dodge/Update/Input/InGame.hs 479;" f +spaceAction src/Dodge/Update/Input/InGame.hs 498;" f spanColLightBlackI src/Dodge/Placement/Instance/LightSource.hs 186;" f spanColLightI src/Dodge/Placement/Instance/LightSource.hs 179;" f spanLS src/Dodge/Placement/Instance/LightSource.hs 171;" f @@ -5786,7 +5787,7 @@ stackText src/Picture/Base.hs 188;" f stackedInventory src/Dodge/Creature.hs 281;" f startCr src/Dodge/Creature.hs 91;" f startCrafts src/Dodge/Room/Start.hs 92;" f -startDrag src/Dodge/Update/Input/InGame.hs 217;" f +startDrag src/Dodge/Update/Input/InGame.hs 235;" f startInvList src/Dodge/Creature.hs 109;" f startInventory src/Dodge/Creature.hs 112;" f startNewGameInSlot src/Dodge/StartNewGame.hs 15;" f @@ -5875,7 +5876,7 @@ testInventory src/Dodge/Creature.hs 257;" f testStringInit src/Dodge/TestString.hs 26;" f text src/Picture/Base.hs 193;" f textGrad src/Picture/Text.hs 5;" f -textInputFocus src/Dodge/InputFocus.hs 18;" f +textInputFocus src/Dodge/InputFocus.hs 16;" f textJustifyCenter src/Picture/Base.hs 212;" f textJustifyLeft src/Picture/Base.hs 208;" f textJustifyRight src/Picture/Base.hs 198;" f @@ -5926,8 +5927,8 @@ toggleCombineInv src/Dodge/DisplayInventory.hs 35;" f toggleCommand src/Dodge/Terminal.hs 196;" f toggleEquipmentAt src/Dodge/Creature/Impulse/UseItem.hs 79;" f toggleJust src/MaybeHelp.hs 41;" f -toggleMap src/Dodge/Update/Input/InGame.hs 520;" f -toggleTweakInv src/Dodge/Update/Input/InGame.hs 533;" f +toggleMap src/Dodge/Update/Input/InGame.hs 539;" f +toggleTweakInv src/Dodge/Update/Input/InGame.hs 552;" f togglesToEffects src/Dodge/Terminal.hs 248;" f tone440S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 474;" f tone440sawtoothS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 444;" f @@ -5998,7 +5999,7 @@ trunkDepth src/TreeHelp.hs 161;" f tryAssignHotkey src/Dodge/Creature/YourControl.hs 85;" f tryAttachBulletBelt src/Dodge/Euse.hs 40;" f tryChargeBattery src/Dodge/Euse.hs 43;" f -tryCombine src/Dodge/Update/Input/InGame.hs 542;" f +tryCombine src/Dodge/Update/Input/InGame.hs 561;" f tryDropSelected src/Dodge/Update/Input/InGame.hs 104;" f tryGetChannel src/Sound.hs 96;" f tryGetRootAttachedFromInvID src/Dodge/Inventory/Location.hs 20;" f @@ -6047,7 +6048,7 @@ updateAllNodes src/TreeHelp.hs 85;" f updateArc src/Dodge/Tesla/Arc.hs 86;" f updateAttachedItems src/Dodge/Creature/State.hs 173;" f updateAutoRecharge src/Dodge/Creature/State.hs 324;" f -updateBackspaceRegex src/Dodge/Update/Input/InGame.hs 414;" f +updateBackspaceRegex src/Dodge/Update/Input/InGame.hs 433;" f updateBarrel src/Dodge/Barreloid.hs 45;" f updateBarreloid src/Dodge/Barreloid.hs 13;" f updateBounds src/Dodge/Update/Camera.hs 245;" f @@ -6070,35 +6071,35 @@ updateDistortion src/Dodge/Distortion.hs 5;" f updateDistortions src/Dodge/Update.hs 529;" f updateEnergyBall src/Dodge/EnergyBall.hs 46;" f updateEnergyBalls src/Dodge/Update.hs 556;" f -updateEnterRegex src/Dodge/Update/Input/InGame.hs 455;" f +updateEnterRegex src/Dodge/Update/Input/InGame.hs 474;" f updateExpBarrel src/Dodge/Barreloid.hs 19;" f updateFBOTO src/Framebuffer/Update.hs 97;" f updateFBOTO3 src/Framebuffer/Update.hs 131;" f updateFlame src/Dodge/Flame.hs 71;" f updateFlames src/Dodge/Update.hs 553;" f updateFloatingCamera src/Dodge/Update/Camera.hs 36;" f -updateFunctionKey src/Dodge/Update/Input/InGame.hs 306;" f -updateFunctionKeys src/Dodge/Update/Input/InGame.hs 299;" f +updateFunctionKey src/Dodge/Update/Input/InGame.hs 324;" f +updateFunctionKeys src/Dodge/Update/Input/InGame.hs 317;" f updateGusts src/Dodge/Update.hs 707;" f updateHeldRootItem src/Dodge/Creature/State.hs 167;" f updateHumanoid src/Dodge/Humanoid.hs 12;" f updateIMl src/Dodge/Update.hs 498;" f updateIMl' src/Dodge/Update.hs 503;" f updateInGameCamera src/Dodge/Update/Camera.hs 70;" f -updateInitialPressInGame src/Dodge/Update/Input/InGame.hs 359;" f +updateInitialPressInGame src/Dodge/Update/Input/InGame.hs 377;" f updateInstantBullets src/Dodge/Update.hs 645;" f updateInv src/Dodge/Creature/State.hs 152;" f updateInventoryPositioning src/Dodge/DisplayInventory.hs 87;" f updateItemTargeting src/Dodge/Creature/State.hs 268;" f updateItemWithOrientation src/Dodge/Creature/State.hs 194;" f -updateKeyInGame src/Dodge/Update/Input/InGame.hs 353;" f -updateKeysInTerminal src/Dodge/Update/Input/InGame.hs 341;" f +updateKeyInGame src/Dodge/Update/Input/InGame.hs 371;" f +updateKeysInTerminal src/Dodge/Update/Input/InGame.hs 359;" f updateLampoid src/Dodge/Lampoid.hs 12;" f updateLaser src/Dodge/Laser/Update.hs 13;" f updateLasers src/Dodge/Update.hs 427;" f updateLightSources src/Dodge/Update.hs 532;" f updateLinearShockwave src/Dodge/LinearShockwave/Update.hs 8;" f -updateLongPressInGame src/Dodge/Update/Input/InGame.hs 374;" f +updateLongPressInGame src/Dodge/Update/Input/InGame.hs 392;" f updateMIM src/Dodge/Update.hs 658;" f updateMachine src/Dodge/Machine/Update.hs 19;" f updateMouseClickInGame src/Dodge/Update/Input/InGame.hs 165;" f @@ -6114,8 +6115,8 @@ updatePastWorlds src/Dodge/Update.hs 415;" f updatePosEvent src/Dodge/PosEvent.hs 11;" f updatePosEvents src/Dodge/Update.hs 565;" f updatePreload src/Preload/Update.hs 20;" f -updatePressedButtonsCarte src/Dodge/Update/Input/InGame.hs 316;" f -updatePressedButtonsCarte' src/Dodge/Update/Input/InGame.hs 319;" f +updatePressedButtonsCarte src/Dodge/Update/Input/InGame.hs 334;" f +updatePressedButtonsCarte' src/Dodge/Update/Input/InGame.hs 337;" f updateProjectile src/Dodge/Projectile/Update.hs 23;" f updateProp src/Dodge/Prop/Update.hs 11;" f updateRBList src/Dodge/Inventory/RBList.hs 16;" f