Cleanup, only commented out char sequence scrolling code

src/Dodge/Update/Camera.hs

@@ -94,7 +94,6 @@ moveZoomCamera cfig theinput cr campos =
     mscopeoffset = do
         guard (SDL.ButtonRight `M.member` _mouseButtons theinput)
         i <- cr ^? crManipulation . manObject . inInventory . ispItem
-        --(cr ^? crInv . ix (i - 1) . itUse . attachParams . scrollAttachParams . opticPos)
         (fmap (rotateV camrot) (cr ^? crInv . ix i . itScope . opticPos))
             <|> (cr ^? crInv . ix i . itScope . remotePos)
     camrot = campos ^. camRot
@@ -145,7 +144,6 @@ updateScopeZoom' i w
     wppointer = cWorld . lWorld . creatures . ix 0 . crInv . ix i . itScope
     resetscope (OpticScope _ _ defz) = OpticScope (V2 0 0) defz defz
     resetscope otherAtt = otherAtt
-    --mp = rotateV (w ^. wCam . camRot) $ _mousePos (_input w)
     mp = _mousePos (_input w)
 
 doScopeZoom :: Int -> Point2 -> Scope -> Scope
@@ -207,18 +205,7 @@ doWallRotate wl w = rotateUsing $ (argV . uncurry (-.-) $ _wlLine wl) - (w ^. wC
         b' = fromIntegral (round b :: Int)
 
 rotateCameraBy :: Float -> World -> World
-rotateCameraBy x w =
-    w
-        & wCam . camRot +~ x
---        & cWorld %~ rotateanyscope
-  where
-    rotateanyscope = fromMaybe id $ do
-        i <- w ^? cWorld . lWorld . creatures . ix 0 . crManipulation . manObject . inInventory . ispItem
-        return $
-            lWorld . creatures . ix 0 . crInv . ix i
-                . itScope
-                . opticPos
-                %~ rotateV x
+rotateCameraBy x = wCam . camRot +~ x
 
 rotateCamera :: Configuration -> World -> World
 rotateCamera cfig w

src/Dodge/Update/Scroll.hs

@@ -6,7 +6,7 @@ import qualified Data.Map.Strict as M
 import Data.Maybe
 import Dodge.Base
 import Dodge.Data.Universe
-import Dodge.HeldScroll
+--import Dodge.HeldScroll
 import Dodge.InputFocus
 import Dodge.Inventory
 import Dodge.SelectionSections
@@ -26,10 +26,13 @@ updateWheelEvent yi w = case w ^. hud . hudElement of
         -- functions that modify the inventory should be centralised so that
         -- this lock can be sensibly applied, perhaps
         | w ^?! cWorld . lWorld . creatures . ix 0 . crInvLock -> w
-        | rbDown -> case  (yourScrollAttachment w, _rbOptions w) of
-            (_,EquipOptions{}) -> w & rbOptions . opSel %~ scrollRBOption yi rbscrollmax
-            (Nothing, _) -> w
-            (Just (invid,hs), _) -> doHeldScroll invid hs y w
+--        | rbDown -> case  (yourScrollAttachment w, _rbOptions w) of
+--            (_,EquipOptions{}) -> w & rbOptions . opSel %~ scrollRBOption yi rbscrollmax
+--            (Nothing, _) -> w
+--            (Just (invid,hs), _) -> doHeldScroll invid hs y w
+        | rbDown -> case   _rbOptions w of
+            EquipOptions{} -> w & rbOptions . opSel %~ scrollRBOption yi rbscrollmax
+            NoRightButtonOptions -> w
         | lbDown -> w & wCam . camZoom +~ y
         | invKeyDown -> changeSwapSel yi w
         | otherwise -> scrollAugInvSel yi w