Cleanup various equipment/right button code

src/Dodge/Data/RightButtonOptions.hs

@@ -12,8 +12,8 @@ import Data.Aeson
 import Data.Aeson.TH
 import Dodge.Data.Equipment.Misc
 
-data RightButtonOptions
-    = NoRightButtonOptions
+data RightButtonState
+    = NoRightButtonState
     | EquipOptions { _opSel :: Int }
     --deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
@@ -40,7 +40,7 @@ data EquipmentAllocation
         }
     --deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
-makeLenses ''RightButtonOptions
+makeLenses ''RightButtonState
 makeLenses ''EquipmentAllocation
 deriveJSON defaultOptions ''EquipmentAllocation
-deriveJSON defaultOptions ''RightButtonOptions
+deriveJSON defaultOptions ''RightButtonState

src/Dodge/Data/World.hs

@@ -41,7 +41,7 @@ data World = World
     , _playingSounds :: M.Map SoundOrigin Sound
     , _input :: Input
     , _testFloat :: Float
-    , _rbOptions :: RightButtonOptions
+    , _rbState :: RightButtonState
     , _hud :: HUD
     , _worldEventFlags :: Set WorldEventFlag
     , _crZoning :: IntMap (IntMap IntSet)