From a2dd10323c608f8ec931c85eaab6c99065c47c60 Mon Sep 17 00:00:00 2001 From: justin Date: Thu, 31 Oct 2024 09:55:12 +0000 Subject: [PATCH] Remove _ssCursor --- ghcidOutput | 6 +- src/Dodge/Data/SelectionList.hs | 2 +- src/Dodge/Default/World.hs | 2 +- src/Dodge/DisplayInventory.hs | 10 +- tags | 161 ++++++++++++++++---------------- 5 files changed, 93 insertions(+), 88 deletions(-) diff --git a/ghcidOutput b/ghcidOutput index 74a2d71b7..ae0c9b3c8 100644 --- a/ghcidOutput +++ b/ghcidOutput @@ -1 +1,5 @@ -All good (594 modules, at 09:43:09) +/home/justin/Haskell/loop/src/Dodge/DisplayInventory.hs:214:5-9: warning: [-Wunused-local-binds] + Defined but not used: ‘scurs’ + | +214 | scurs = do + | ^^^^^ diff --git a/src/Dodge/Data/SelectionList.hs b/src/Dodge/Data/SelectionList.hs index d789c3b71..62a2533ac 100644 --- a/src/Dodge/Data/SelectionList.hs +++ b/src/Dodge/Data/SelectionList.hs @@ -34,7 +34,7 @@ data SectionCursor = SectionCursor data SelectionSection a = SelectionSection { _ssItems :: IntMap (SelectionItem a) - , _ssCursor :: Maybe SectionCursor +-- , _ssCursor :: Maybe SectionCursor , _ssMinSize :: Int , _ssOffset :: Int , _ssShownItems :: [Picture] diff --git a/src/Dodge/Default/World.hs b/src/Dodge/Default/World.hs index 06a20f85b..9d68d2af1 100644 --- a/src/Dodge/Default/World.hs +++ b/src/Dodge/Default/World.hs @@ -187,7 +187,7 @@ defaultSS :: SelectionSection a defaultSS = SelectionSection { _ssItems = mempty - , _ssCursor = Nothing +-- , _ssCursor = Nothing , _ssMinSize = 10 , _ssOffset = 0 , _ssShownItems = [] diff --git a/src/Dodge/DisplayInventory.hs b/src/Dodge/DisplayInventory.hs index fbaf0c18a..951f2e4a4 100644 --- a/src/Dodge/DisplayInventory.hs +++ b/src/Dodge/DisplayInventory.hs @@ -206,7 +206,7 @@ updateSection :: updateSection sis mcsel availablelines ss = ss & ssItems .~ sis - & ssCursor .~ scurs +-- & ssCursor .~ scurs & ssOffset .~ offset & ssShownItems .~ shownitems where @@ -290,7 +290,7 @@ enterCombineInv cfig w = filtsection = SelectionSection { _ssItems = mempty - , _ssCursor = Nothing +-- , _ssCursor = Nothing , _ssMinSize = 0 , _ssOffset = 0 , _ssShownItems = mempty @@ -304,9 +304,9 @@ enterCombineInv cfig w = availablelines SelectionSection { _ssItems = cm - , _ssCursor = do - (_, si) <- IM.lookupMin cm - return $ SectionCursor 0 (_siHeight si) (_siColor si) +-- , _ssCursor = do +-- (_, si) <- IM.lookupMin cm +-- return $ SectionCursor 0 (_siHeight si) (_siColor si) , _ssMinSize = 5 , _ssOffset = 0 , _ssShownItems = mempty diff --git a/tags b/tags index 88b609cdd..361934114 100644 --- a/tags +++ b/tags @@ -3411,7 +3411,7 @@ attachOnward' src/Dodge/Tree/Compose.hs 98;" f attachTree src/Dodge/Tree/Compose.hs 38;" f attentionViewPoint src/Dodge/Creature/ReaderUpdate.hs 66;" f attribSize src/Shader/Compile.hs 306;" f -augInvDirectSelect src/Dodge/Inventory.hs 217;" f +augInvDirectSelect src/Dodge/Inventory.hs 218;" f augmentedHUD src/Dodge/Item/Scope.hs 47;" f autoAmr src/Dodge/Item/Held/Rod.hs 51;" f autoBS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 350;" f @@ -3547,9 +3547,9 @@ centroidNum src/Geometry/Polygon.hs 133;" f chainCreatureUpdates src/Dodge/Creature/ChainUpdates.hs 6;" f chainLinkOrientation src/Dodge/Creature/State.hs 183;" f chainPairs src/Geometry.hs 363;" f -changeSwapClose src/Dodge/Inventory.hs 156;" f -changeSwapSel src/Dodge/Inventory.hs 148;" f -changeSwapWith src/Dodge/Inventory.hs 211;" f +changeSwapClose src/Dodge/Inventory.hs 157;" f +changeSwapSel src/Dodge/Inventory.hs 149;" f +changeSwapWith src/Dodge/Inventory.hs 212;" f charToTuple src/Picture/Base.hs 317;" f charToTupleGrad src/Picture/Text.hs 18;" f chargeIfEquipped src/Dodge/ItEffect.hs 54;" f @@ -3566,6 +3566,7 @@ checkErrorGL src/Shader/Compile.hs 255;" f checkFBO src/Framebuffer/Check.hs 6;" f checkGLError src/GLHelp.hs 17;" f checkInvSlotsYou src/Dodge/Inventory/CheckSlots.hs 16;" f +checkInventorySelectionExists src/Dodge/DisplayInventory.hs 82;" f checkTermDist src/Dodge/Update.hs 289;" f checkWallLeft src/Dodge/LevelGen/StaticWalls/Deprecated.hs 29;" f checkWallRight src/Dodge/LevelGen/StaticWalls.hs 54;" f @@ -3591,7 +3592,7 @@ clClSpringVel src/Dodge/Update.hs 737;" f clZoneSize src/Dodge/Zone/Size.hs 3;" f clZoneSize src/Dodge/Zoning/Cloud.hs 21;" f clampPath src/Dodge/Room/Procedural.hs 166;" f -cldtPropagateFold src/Dodge/DoubleTree.hs 232;" f +cldtPropagateFold src/Dodge/DoubleTree.hs 230;" f cleanUpPreload src/Preload.hs 11;" f cleanUpRenderPreload src/Preload/Render.hs 216;" f cleanUpSoundPreload src/Preload.hs 16;" f @@ -3607,7 +3608,7 @@ clipZoom src/Dodge/Update/Camera.hs 215;" f clockCycle src/Dodge/Clock.hs 9;" f closeObjEq src/Dodge/Inventory/CloseObject.hs 15;" f closeObjPos src/Dodge/Inventory/CloseObject.hs 10;" f -closeObjectInfo src/Dodge/Render/HUD.hs 180;" f +closeObjectInfo src/Dodge/Render/HUD.hs 186;" f closeObjectToSelectionItem src/Dodge/Inventory/SelectionList.hs 54;" f closeObjectToTextPictures src/Dodge/Inventory/SelectionList.hs 68;" f closestCreatureID src/Dodge/Debug.hs 92;" f @@ -3643,7 +3644,7 @@ combinationsOf src/Multiset.hs 46;" f combinationsTrie src/Dodge/Combine.hs 41;" f combineAwareness src/Dodge/Creature/Perception.hs 109;" f combineFloors src/Dodge/Room/Procedural.hs 172;" f -combineInventoryExtra src/Dodge/Render/HUD.hs 290;" f +combineInventoryExtra src/Dodge/Render/HUD.hs 296;" f combineItemListYouX src/Dodge/Combine.hs 33;" f combineList src/Dodge/Combine.hs 20;" f combineRooms src/Dodge/Room/Procedural.hs 152;" f @@ -3954,8 +3955,8 @@ disconnectTerminal src/Dodge/Terminal.hs 215;" f displayConfig src/Dodge/Menu.hs 196;" f displayControls src/Dodge/Menu.hs 206;" f displayFrameTicks src/Dodge/Render/Picture.hs 39;" f -displayFreeSlots src/Dodge/DisplayInventory.hs 169;" f -displayTerminal src/Dodge/Render/HUD.hs 327;" f +displayFreeSlots src/Dodge/DisplayInventory.hs 173;" f +displayTerminal src/Dodge/Render/HUD.hs 333;" f displayTerminalLineString src/Dodge/Update.hs 426;" f dist src/Geometry/Vector.hs 179;" f dist3 src/Geometry/Vector3D.hs 101;" f @@ -4051,7 +4052,7 @@ doubleCorridorBarrels src/Dodge/Room/Room.hs 265;" f doubleLampCover src/Dodge/Placement/Instance/LightSource/Cover.hs 28;" f doublePair src/Geometry.hs 149;" f doublePairSet src/Geometry.hs 153;" f -doubleTreeToIndentList src/Dodge/DoubleTree.hs 74;" f +doubleTreeToIndentList src/Dodge/DoubleTree.hs 72;" f doubleV2 src/Geometry.hs 156;" f drawAllShadows src/Dodge/Shadows.hs 5;" f drawAugmentedHUD src/Dodge/Creature/State.hs 210;" f @@ -4066,7 +4067,7 @@ drawCPUShadows src/Dodge/Render/Shadow.hs 19;" f drawCarte src/Dodge/Render/HUD/Carte.hs 14;" f drawCircFlare src/Dodge/Flare.hs 25;" f drawCollisionTest src/Dodge/Debug/Picture.hs 103;" f -drawCombineInventory src/Dodge/Render/HUD.hs 136;" f +drawCombineInventory src/Dodge/Render/HUD.hs 142;" f drawConcurrentMessage src/Dodge/Render/Picture.hs 62;" f drawCorpse src/Dodge/Corpse/Draw.hs 6;" f drawCrInfo src/Dodge/Debug/Picture.hs 342;" f @@ -4076,13 +4077,13 @@ drawCross src/Dodge/Render/Label.hs 24;" f drawCrossCol src/Dodge/Render/Label.hs 21;" f drawCursorAt src/Dodge/Render/List.hs 49;" f drawDDATest src/Dodge/Debug/Picture.hs 256;" f -drawDIMouseOver src/Dodge/Render/HUD.hs 102;" f -drawDISelections src/Dodge/Render/HUD.hs 120;" f +drawDIMouseOver src/Dodge/Render/HUD.hs 108;" f +drawDISelections src/Dodge/Render/HUD.hs 126;" f drawDoorPaths src/Dodge/Debug/Picture.hs 217;" f drawDoubleLampCover src/Dodge/Prop/Draw.hs 81;" f drawEnergyBall src/Dodge/EnergyBall/Draw.hs 8;" f drawEquipment src/Dodge/Creature/Picture.hs 140;" f -drawExamineInventory src/Dodge/Render/HUD.hs 150;" f +drawExamineInventory src/Dodge/Render/HUD.hs 156;" f drawFarWallDetect src/Dodge/Debug/Picture.hs 234;" f drawFlame src/Dodge/Flame/Draw.hs 7;" f drawFlamelet src/Dodge/EnergyBall/Draw.hs 23;" f @@ -4090,12 +4091,12 @@ drawFlare src/Dodge/Flare.hs 12;" f drawFooterText src/Dodge/Render/MenuScreen.hs 65;" f drawForceField src/Dodge/Wall/Draw.hs 11;" f drawGib src/Dodge/Prop/Draw.hs 28;" f -drawHP src/Dodge/Render/HUD.hs 49;" f -drawHUD src/Dodge/Render/HUD.hs 41;" f +drawHP src/Dodge/Render/HUD.hs 53;" f +drawHUD src/Dodge/Render/HUD.hs 45;" f drawInputMenu src/Dodge/Render/MenuScreen.hs 18;" f drawInspectWall src/Dodge/Debug/Picture.hs 209;" f drawInspectWalls src/Dodge/Debug/Picture.hs 197;" f -drawInventory src/Dodge/Render/HUD.hs 58;" f +drawInventory src/Dodge/Render/HUD.hs 62;" 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 @@ -4123,10 +4124,10 @@ drawPointLabel src/Dodge/Render/Label.hs 13;" f drawProjectile src/Dodge/Projectile/Draw.hs 13;" f drawProp src/Dodge/Prop/Draw.hs 15;" f drawProp' src/Dodge/Prop/Draw.hs 12;" f -drawRBOptions src/Dodge/Render/HUD.hs 198;" f +drawRBOptions src/Dodge/Render/HUD.hs 204;" f drawRadarSweep src/Dodge/RadarSweep/Draw.hs 7;" f drawRemoteShell src/Dodge/Projectile/Draw.hs 30;" f -drawRootCursor src/Dodge/Render/HUD.hs 78;" f +drawRootCursor src/Dodge/Render/HUD.hs 82;" f drawSSCursor src/Dodge/SelectionSections/Draw.hs 30;" f drawSSMultiCursor src/Dodge/SelectionSections/Draw.hs 41;" f drawSelectionList src/Dodge/Render/List.hs 30;" f @@ -4139,7 +4140,7 @@ drawShell src/Dodge/Projectile/Draw.hs 20;" f 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 128;" f +drawSubInventory src/Dodge/Render/HUD.hs 134;" f drawSweep src/Dodge/Render/Picture.hs 101;" f drawSwitch src/Dodge/Button/Draw.hs 15;" f drawSwitchWire src/Dodge/LevelGen/Switch.hs 28;" f @@ -4165,15 +4166,15 @@ dropByState src/Dodge/Creature/State.hs 118;" f dropExcept src/Dodge/Creature/Action.hs 172;" f dropItem src/Dodge/Creature/Action.hs 177;" f drumMag src/Dodge/Item/Ammo.hs 48;" f -dtIL src/Dodge/DoubleTree.hs 77;" f -dtToAdjRootParent src/Dodge/DoubleTree.hs 128;" f -dtToAdjRootParentEither src/Dodge/DoubleTree.hs 134;" f -dtToAdjacency src/Dodge/DoubleTree.hs 84;" f -dtToIntMapWithRoot src/Dodge/DoubleTree.hs 90;" f -dtToLRAdj src/Dodge/DoubleTree.hs 106;" f -dtToLRAdjEither src/Dodge/DoubleTree.hs 116;" f -dtToRootIntMap' src/Dodge/DoubleTree.hs 94;" f -dtToUpDownAdj src/Dodge/DoubleTree.hs 98;" f +dtIL src/Dodge/DoubleTree.hs 75;" f +dtToAdjRootParent src/Dodge/DoubleTree.hs 126;" f +dtToAdjRootParentEither src/Dodge/DoubleTree.hs 132;" f +dtToAdjacency src/Dodge/DoubleTree.hs 82;" f +dtToIntMapWithRoot src/Dodge/DoubleTree.hs 88;" f +dtToLRAdj src/Dodge/DoubleTree.hs 104;" f +dtToLRAdjEither src/Dodge/DoubleTree.hs 114;" f +dtToRootIntMap' src/Dodge/DoubleTree.hs 92;" f +dtToUpDownAdj src/Dodge/DoubleTree.hs 96;" f dummyMenuOption src/Dodge/Menu/Option.hs 81;" f ebFlicker src/Dodge/EnergyBall.hs 94;" f edgeFormatting src/Dodge/Combine/Graph.hs 118;" f @@ -4188,10 +4189,10 @@ 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 -enterCombineInv src/Dodge/DisplayInventory.hs 269;" f +enterCombineInv src/Dodge/DisplayInventory.hs 273;" f eqConstr src/SameConstr.hs 17;" f eqPosText src/Dodge/Equipment/Text.hs 6;" f -equipAllocString src/Dodge/Render/HUD.hs 256;" f +equipAllocString src/Dodge/Render/HUD.hs 262;" f equipInfo src/Dodge/Item/Info.hs 103;" f equipItemSPic src/Dodge/Item/Draw/SPic.hs 65;" f equipPosition src/Dodge/Item/Draw.hs 29;" f @@ -4237,7 +4238,7 @@ fdiv src/ShortShow.hs 27;" f feet src/Dodge/Creature/Picture.hs 51;" f ffoldM src/Framebuffer/Update.hs 79;" f filter3 src/FoldableHelp.hs 76;" f -filterSectionsPair src/Dodge/DisplayInventory.hs 136;" f +filterSectionsPair src/Dodge/DisplayInventory.hs 140;" f findBlips src/Dodge/RadarSweep.hs 44;" f findBoundDists src/Dodge/Update/Camera.hs 235;" f findClosePoint src/Dodge/LevelGen/StaticWalls.hs 155;" f @@ -4284,7 +4285,7 @@ flockPointTarget src/Dodge/Creature/Boid.hs 199;" f flockPointTargetR src/Dodge/Creature/Boid.hs 266;" f flockToPointUsing src/Dodge/Creature/Boid.hs 214;" f flockToPointUsing' src/Dodge/Creature/Boid.hs 227;" f -floorItemPickupInfo src/Dodge/Render/HUD.hs 185;" f +floorItemPickupInfo src/Dodge/Render/HUD.hs 191;" f floorItemSPic src/Dodge/Render/ShapePicture.hs 119;" f floorWire src/Dodge/Wire.hs 13;" f foamSprayFadeOutS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 398;" f @@ -4362,11 +4363,11 @@ getLaserColor src/Dodge/HeldUse.hs 196;" f getLaserDamage src/Dodge/HeldUse.hs 193;" f getLaserPhaseV src/Dodge/HeldUse.hs 190;" f getLinksOfType src/Dodge/RoomLink.hs 39;" f -getMouseInvSel src/Dodge/Render/HUD.hs 111;" f +getMouseInvSel src/Dodge/Render/HUD.hs 117;" f getNodePos src/Dodge/Path.hs 31;" f getPretty src/AesonHelp.hs 7;" f getPrettyShort src/AesonHelp.hs 10;" f -getRootItemBounds src/Dodge/Render/HUD.hs 92;" f +getRootItemBounds src/Dodge/Render/HUD.hs 98;" f getSensor src/Dodge/Terminal.hs 187;" f getSmoothScrollValue src/Dodge/SmoothScroll.hs 17;" f getSplitString src/Dodge/Debug/Terminal.hs 123;" f @@ -4441,7 +4442,7 @@ hat src/Dodge/Item/Equipment.hs 94;" f head src/DoubleStack.hs 14;" f headLamp src/Dodge/Item/Equipment.hs 100;" f headLampShape src/Dodge/Item/Draw/SPic.hs 381;" f -headMap src/Dodge/DoubleTree.hs 172;" f +headMap src/Dodge/DoubleTree.hs 170;" f heal src/Dodge/Item/Consumable.hs 17;" f heal25 src/Dodge/Item/Consumable.hs 14;" f healS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 354;" f @@ -4479,7 +4480,7 @@ iShape src/Dodge/Placement/Instance/LightSource.hs 74;" f icosahedronPoints src/Polyhedra/Geodesic.hs 12;" f icosohedronFaces src/Polyhedra/Geodesic.hs 19;" f ifConfigWallRotate src/Dodge/Update/Camera.hs 171;" f -ildtPropagate src/Dodge/DoubleTree.hs 59;" f +ildtPropagate src/Dodge/DoubleTree.hs 57;" f impulsiveAIBefore src/Dodge/Creature/Impulse.hs 22;" f inCloseRegex src/Dodge/InputFocus.hs 94;" f inInputFocus src/Dodge/InputFocus.hs 59;" f @@ -4550,9 +4551,9 @@ interweave src/Justify.hs 17;" f intsToPos src/Dodge/Room/Modify/Girder.hs 160;" f invAdj src/Dodge/Item/Grammar.hs 186;" f invCursorParams src/Dodge/ListDisplayParams.hs 38;" f -invDimColor src/Dodge/DisplayInventory.hs 163;" f +invDimColor src/Dodge/DisplayInventory.hs 167;" f invDisplayParams src/Dodge/ListDisplayParams.hs 32;" f -invHead src/Dodge/Render/HUD.hs 363;" f +invHead src/Dodge/Render/HUD.hs 369;" f invLDT src/Dodge/Item/Grammar.hs 169;" f invRootMap src/Dodge/Item/Grammar.hs 178;" f invRootTrees src/Dodge/Item/Grammar.hs 208;" f @@ -4563,8 +4564,8 @@ invSideEff src/Dodge/Creature/State.hs 162;" f invSize src/Dodge/Inventory/CheckSlots.hs 41;" f invTrees src/Dodge/Item/Grammar.hs 196;" f invTrees' src/Dodge/Item/Grammar.hs 200;" f -inventoryExtra src/Dodge/Render/HUD.hs 265;" f -inventoryExtraH src/Dodge/Render/HUD.hs 276;" f +inventoryExtra src/Dodge/Render/HUD.hs 271;" f +inventoryExtraH src/Dodge/Render/HUD.hs 282;" f inventoryX src/Dodge/Creature.hs 115;" f inverseSelBoundaryDown src/Dodge/SelectionSections.hs 227;" f inverseSelBoundaryUp src/Dodge/SelectionSections.hs 214;" f @@ -4673,7 +4674,7 @@ lasTunnelRunPast src/Dodge/Room/LasTurret.hs 165;" f lasTurret src/Dodge/Placement/Instance/Turret.hs 23;" f laser src/Dodge/Item/Held/BatteryGuns.hs 40;" f laserLinkTest src/Dodge/Item/Grammar.hs 102;" f -lastMap src/Dodge/DoubleTree.hs 176;" f +lastMap src/Dodge/DoubleTree.hs 174;" f latchkey src/Dodge/Item/Held/Utility.hs 23;" f launcher src/Dodge/Item/Held/Launcher.hs 12;" f launcherCrit src/Dodge/Creature/LauncherCrit.hs 12;" f @@ -4681,15 +4682,15 @@ launcherPic src/Dodge/Item/Draw/SPic.hs 331;" f launcherX src/Dodge/Item/Held/Launcher.hs 32;" f layoutLevelFromSeed src/Dodge/LevelGen.hs 47;" f ldpVerticalSelection src/Dodge/Update/Input/ScreenLayer.hs 90;" f -ldtIL src/Dodge/DoubleTree.hs 151;" f -ldtPropagate src/Dodge/DoubleTree.hs 22;" f -ldtPropagateFold src/Dodge/DoubleTree.hs 31;" f -ldtPropagateFoldTree src/Dodge/DoubleTree.hs 47;" f -ldtPropagateIndices src/Dodge/DoubleTree.hs 66;" f -ldtToDT src/Dodge/DoubleTree.hs 17;" f -ldtToIM src/Dodge/DoubleTree.hs 145;" f -ldtToIndentList src/Dodge/DoubleTree.hs 148;" f -ldtToLoc src/Dodge/DoubleTree.hs 189;" f +ldtIL src/Dodge/DoubleTree.hs 149;" f +ldtPropagate src/Dodge/DoubleTree.hs 20;" f +ldtPropagateFold src/Dodge/DoubleTree.hs 29;" f +ldtPropagateFoldTree src/Dodge/DoubleTree.hs 45;" f +ldtPropagateIndices src/Dodge/DoubleTree.hs 64;" f +ldtToDT src/Dodge/DoubleTree.hs 15;" f +ldtToIM src/Dodge/DoubleTree.hs 143;" f +ldtToIndentList src/Dodge/DoubleTree.hs 146;" f +ldtToLoc src/Dodge/DoubleTree.hs 187;" f left src/DoubleStack.hs 16;" f leftInfo src/Dodge/Item/Info.hs 93;" f leftIsParentCombine src/Dodge/Item/Grammar.hs 130;" f @@ -4722,13 +4723,13 @@ listConfig src/Dodge/Menu.hs 199;" f listControls src/Dodge/Menu.hs 212;" f listCursorChooseBorderScale src/Dodge/Render/List.hs 118;" f listGuard src/Dodge/Creature/ReaderUpdate.hs 188;" f -listSelectionColorPicture src/Dodge/DisplayInventory.hs 261;" f +listSelectionColorPicture src/Dodge/DisplayInventory.hs 265;" f litCorridor90 src/Dodge/Room/RoadBlock.hs 26;" f llleft src/Dodge/Item/Grammar.hs 105;" f llright src/Dodge/Item/Grammar.hs 112;" f lmt src/MatrixHelper.hs 43;" f lnkBothAnd src/Dodge/Room/Procedural.hs 121;" f -lnkMidPosInvSelsCol src/Dodge/Render/HUD.hs 352;" f +lnkMidPosInvSelsCol src/Dodge/Render/HUD.hs 358;" f lnkPosDir src/Dodge/RoomLink.hs 97;" f loadDodgeConfig src/Dodge/Config/Load.hs 9;" f loadMusic src/Dodge/SoundLogic/LoadSound.hs 21;" f @@ -4739,13 +4740,13 @@ loadSound src/Dodge/SoundLogic/LoadSound.hs 11;" f loadSounds src/Dodge/SoundLogic/LoadSound.hs 16;" f loadingScreen src/Dodge/Menu/Loading.hs 7;" f loadme src/Dodge/Debug/Terminal.hs 136;" f -locGoHelp src/Dodge/DoubleTree.hs 222;" f -locGoLeft src/Dodge/DoubleTree.hs 211;" f -locGoRight src/Dodge/DoubleTree.hs 216;" f -locLeftmost src/Dodge/DoubleTree.hs 204;" f -locRightmost src/Dodge/DoubleTree.hs 207;" f -locToTop src/Dodge/DoubleTree.hs 200;" f -locUp src/Dodge/DoubleTree.hs 193;" f +locGoHelp src/Dodge/DoubleTree.hs 220;" f +locGoLeft src/Dodge/DoubleTree.hs 209;" f +locGoRight src/Dodge/DoubleTree.hs 214;" f +locLeftmost src/Dodge/DoubleTree.hs 202;" f +locRightmost src/Dodge/DoubleTree.hs 205;" f +locToTop src/Dodge/DoubleTree.hs 198;" f +locUp src/Dodge/DoubleTree.hs 191;" f lockInv src/Dodge/Inventory/Lock.hs 6;" f lockInvFor src/Dodge/Item/Weapon/TriggerType.hs 50;" f lockRoomKeyItems src/Dodge/LockAndKey.hs 26;" f @@ -5142,7 +5143,7 @@ placeSpotRoomRand src/Dodge/Placement/PlaceSpot.hs 89;" f placeSpotUsingLink src/Dodge/Placement/PlaceSpot.hs 70;" f placeString src/Dodge/Render/MenuScreen.hs 54;" f placeWallPoly src/Dodge/Placement/PlaceSpot.hs 162;" f -plainRegex src/Dodge/DisplayInventory.hs 166;" f +plainRegex src/Dodge/DisplayInventory.hs 170;" f plateCraft src/Dodge/Item/Craftable.hs 45;" f playIfFree src/Sound.hs 136;" f playPositionalSoundQueue src/Sound.hs 144;" f @@ -5251,8 +5252,8 @@ preloadRender src/Preload/Render.hs 30;" f premapMaybe src/FoldlHelp.hs 24;" f prependTwo src/Geometry.hs 165;" f pressedMBEffectsTopInventory src/Dodge/Creature/YourControl.hs 163;" f -prettyDT src/Dodge/DoubleTree.hs 181;" f -prettyLDT src/Dodge/DoubleTree.hs 185;" f +prettyDT src/Dodge/DoubleTree.hs 179;" f +prettyLDT src/Dodge/DoubleTree.hs 183;" f primeS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 422;" f printColumnTitles src/Dodge/Tree/Shift.hs 142;" f printColumns src/Dodge/Tree/Shift.hs 132;" f @@ -5372,7 +5373,7 @@ refract src/Dodge/Item/Weapon/LaserPath.hs 40;" f refreshOptionsSelectionList src/Dodge/Menu/Option.hs 34;" f regexCombs src/Dodge/DisplayInventory.hs 58;" f regexIn src/Regex.hs 4;" f -regexList src/Dodge/DisplayInventory.hs 313;" f +regexList src/Dodge/DisplayInventory.hs 317;" f regexList src/Regex.hs 7;" f reload1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 428;" f reloadLevelStart src/Dodge/Save.hs 71;" f @@ -5522,7 +5523,7 @@ screenPolygon src/Dodge/Base/Window.hs 17;" f screenPolygonBord src/Dodge/Base/Window.hs 27;" f screenPosAbs src/Dodge/ScreenPos.hs 15;" f screenToWorldPos src/Dodge/Base/Coordinate.hs 53;" f -scrollAugInvSel src/Dodge/Inventory.hs 225;" f +scrollAugInvSel src/Dodge/Inventory.hs 226;" f scrollCommandStrings src/Dodge/Update/Scroll.hs 137;" f scrollCommands src/Dodge/Update/Scroll.hs 134;" f scrollDebugInfoInt src/Dodge/Debug.hs 47;" f @@ -5544,16 +5545,16 @@ secondColumnParams src/Dodge/ListDisplayParams.hs 45;" f seedStartMenu src/Dodge/Menu.hs 79;" f seedStartOptions src/Dodge/Menu.hs 82;" f segOnCirc src/Geometry.hs 116;" f -selNumPos src/Dodge/Render/HUD.hs 423;" f -selNumPosCardinal src/Dodge/Render/HUD.hs 446;" f +selNumPos src/Dodge/Render/HUD.hs 429;" f +selNumPosCardinal src/Dodge/Render/HUD.hs 452;" f selSecDrawCursor src/Dodge/Render/List.hs 108;" f selSecDrawCursorAt src/Dodge/Render/List.hs 86;" f -selSecSelCol src/Dodge/Render/HUD.hs 469;" f +selSecSelCol src/Dodge/Render/HUD.hs 475;" f selSecSelSize src/Dodge/SelectionSections.hs 152;" f selSecYint src/Dodge/SelectionSections.hs 161;" f selectCreatureDebugItem src/Dodge/Debug.hs 39;" f selectUse src/Dodge/SelectUse.hs 11;" f -selectedCloseObject src/Dodge/Inventory.hs 238;" f +selectedCloseObject src/Dodge/Inventory.hs 239;" f sensAboveDoor src/Dodge/Room/SensorDoor.hs 63;" f sensInsideDoor src/Dodge/Room/SensorDoor.hs 69;" f senseDamage src/Dodge/Machine/Update.hs 134;" f @@ -5681,9 +5682,9 @@ showEquipItem src/Dodge/Item/Display.hs 68;" f showEquipmentNumber src/Dodge/Item/Display.hs 110;" f showInt src/Dodge/Item/Info.hs 31;" f showIntsString src/Dodge/Tree/Compose.hs 129;" f -showManObj src/Dodge/TestString.hs 43;" f +showManObj src/Dodge/TestString.hs 45;" f showTerminalError src/Dodge/Debug/Terminal.hs 76;" f -showTimeFlow src/Dodge/TestString.hs 90;" f +showTimeFlow src/Dodge/TestString.hs 92;" f shrinkPolyOnEdges src/Geometry/Polygon.hs 136;" f shrinkVert src/Geometry/Polygon.hs 140;" f shuffle src/RandomHelp.hs 49;" f @@ -5698,8 +5699,8 @@ sineRaisePitchOneSecS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 486;" f sineRaisePitchTwoSecS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 340;" f singleAmmo src/Dodge/Default/Item.hs 44;" f singleBlock src/Dodge/Placement/Instance/Wall.hs 30;" f -singleDT src/Dodge/DoubleTree.hs 11;" f -singleLDT src/Dodge/DoubleTree.hs 14;" f +singleDT src/Dodge/DoubleTree.hs 9;" f +singleLDT src/Dodge/DoubleTree.hs 12;" f singleton src/DoubleStack.hs 11;" f singletonTrie src/SimpleTrie.hs 19;" f sizeFBOs src/Framebuffer/Update.hs 22;" f @@ -5826,7 +5827,7 @@ subMap src/TreeHelp.hs 118;" f subZipWith src/Dodge/Placement/Instance/Wall.hs 115;" f swapInOutLinks src/Dodge/RoomLink.hs 80;" f swapIndices src/ListHelp.hs 50;" f -swapInvItems src/Dodge/Inventory.hs 173;" f +swapInvItems src/Dodge/Inventory.hs 174;" f swarmCrit src/Dodge/Creature/SwarmCrit.hs 10;" f swarmUsingCenter src/Dodge/Creature/Boid.hs 171;" f switchDoor src/Dodge/Placement/Instance/Door.hs 96;" f @@ -5939,7 +5940,7 @@ tone440sawtoothquietS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 320;" f topInvW src/Dodge/ListDisplayParams.hs 53;" f topPrismEdgeIndices src/Shader/Poke.hs 327;" f topPrismIndices src/Shader/Poke.hs 402;" f -topTestPart src/Dodge/TestString.hs 39;" f +topTestPart src/Dodge/TestString.hs 41;" f torch src/Dodge/Item/Held/Utility.hs 26;" f torchShape src/Dodge/Item/Draw/SPic.hs 213;" f torqueCr src/Dodge/WorldEffect.hs 70;" f @@ -6056,7 +6057,7 @@ updateBulVel src/Dodge/Bullet.hs 50;" f updateBullet src/Dodge/Bullet.hs 28;" f updateBullets src/Dodge/Update.hs 527;" f updateCamera src/Dodge/Update/Camera.hs 31;" f -updateCloseObjects src/Dodge/Inventory.hs 114;" f +updateCloseObjects src/Dodge/Inventory.hs 115;" f updateCloud src/Dodge/Update.hs 712;" f updateClouds src/Dodge/Update.hs 556;" f updateCombinePositioning src/Dodge/DisplayInventory.hs 34;" f @@ -6066,7 +6067,7 @@ updateCreatureGroups src/Dodge/Update.hs 496;" f updateCreatureSoundPositions src/Dodge/Update.hs 472;" f updateDebugMessageOffset src/Dodge/Update.hs 89;" f updateDelayedEvents src/Dodge/Update.hs 775;" f -updateDisplaySections src/Dodge/DisplayInventory.hs 81;" f +updateDisplaySections src/Dodge/DisplayInventory.hs 85;" f updateDistortion src/Dodge/Distortion.hs 5;" f updateDistortions src/Dodge/Update.hs 517;" f updateEnergyBall src/Dodge/EnergyBall.hs 46;" f @@ -6126,8 +6127,8 @@ updateRootItemID src/Dodge/Inventory/Location.hs 34;" f updateScopeZoom src/Dodge/Update/Camera.hs 127;" f updateScopeZoom' src/Dodge/Update/Camera.hs 132;" f updateScrollTestValue src/Dodge/ScrollValue.hs 6;" f -updateSection src/Dodge/DisplayInventory.hs 196;" f -updateSectionsPositioning src/Dodge/DisplayInventory.hs 175;" f +updateSection src/Dodge/DisplayInventory.hs 200;" f +updateSectionsPositioning src/Dodge/DisplayInventory.hs 179;" f updateSeenWalls src/Dodge/Update.hs 664;" f updateShockwave src/Dodge/Shockwave/Update.hs 12;" f updateShockwaves src/Dodge/Update.hs 538;" f @@ -6304,7 +6305,7 @@ yV2 src/Geometry/Vector.hs 203;" f yellow src/Color.hs 17;" f you src/Dodge/Base/You.hs 18;" f youDropItem src/Dodge/Creature/Action.hs 184;" f -yourAugmentedItem src/Dodge/Render/HUD.hs 192;" f +yourAugmentedItem src/Dodge/Render/HUD.hs 198;" f yourControl src/Dodge/Creature/YourControl.hs 22;" f yourDefaultSpeed src/Dodge/Default/Creature.hs 134;" f yourDefaultStrideLength src/Dodge/Default/Creature.hs 137;" f