Refactor light sources

src/Dodge/Event/Keyboard.hs

@@ -7,7 +7,6 @@ import Dodge.Data
 import Dodge.Save
 import Dodge.Base
 import Dodge.Creature.Action
-import Dodge.Config.KeyConfig
 import Dodge.Event.Test
 import Dodge.Event.Menu
 import Dodge.Menu
@@ -26,7 +25,7 @@ see 'handlePressedKeyInGame'.
 handleKeyboardEvent :: KeyboardEventData -> Universe -> Maybe Universe
 handleKeyboardEvent kev u = case keyboardEventKeyMotion kev of
     Released    -> Just $ u & uvWorld . keys %~ S.delete kcode
-    Pressed     -> (handlePressedKey (keyboardEventRepeat kev) kcode)
+    Pressed     -> handlePressedKey (keyboardEventRepeat kev) kcode
         (u & uvWorld . keys %~ S.insert kcode) 
   where
     kcode = (keysymScancode . keyboardEventKeysym) kev
@@ -41,20 +40,18 @@ handlePressedKey _    scode w
     | otherwise                 = handlePressedKeyInMenu (head $ _menuLayers w) scode w
 
 handlePressedKeyInGame :: Scancode -> World -> Maybe World
-handlePressedKeyInGame scode w
-    | scode == escapeKey (_keyConfig w) = Nothing
-    | scode == pauseKey (_keyConfig w) = Just $ pauseGame $ escapeMap w
-    | scode == dropItemKey (_keyConfig w) = Just $ youDropItem w
-    | scode == toggleMapKey (_keyConfig w) = Just $ toggleMap w
-    | scode == reloadKey (_keyConfig w) = Just $ fromMaybe w $ startReloadingWeapon (you w) w
-    | scode == testEventKey (_keyConfig w) = Just $ testEvent w
-    | scode == spaceActionKey (_keyConfig w) = Just $ spaceAction w
-    | scode == rotateCameraPlusKey (_keyConfig w)  = Just $ w & cameraRot +~ 0.01
-    | scode == rotateCameraMinusKey (_keyConfig w) = Just $ w & cameraRot -~ 0.01
-    | scode == ScancodeX = Just $ w & inventoryMode %~ toggleInv TweakInventory
-    | scode == ScancodeC = Just $ w & inventoryMode %~ toggleInv CombineInventory
-    | scode == ScancodeI = Just $ w & inventoryMode %~ toggleInv InspectInventory
-handlePressedKeyInGame _ w = Just w
+handlePressedKeyInGame scode w = case scode of
+    ScancodeEscape  -> Nothing
+    ScancodeSpace   -> Just $ spaceAction w
+    ScancodeP   -> Just $ pauseGame $ escapeMap w
+    ScancodeF   -> Just $ youDropItem w
+    ScancodeM   -> Just $ toggleMap w
+    ScancodeR   -> Just $ fromMaybe w $ startReloadingWeapon (you w) w
+    ScancodeT   -> Just $ testEvent w
+    ScancodeX   -> Just $ w & inventoryMode %~ toggleInv TweakInventory
+    ScancodeC   -> Just $ w & inventoryMode %~ toggleInv CombineInventory
+    ScancodeI   -> Just $ w & inventoryMode %~ toggleInv InspectInventory
+    _           -> Just w
 
 toggleInv :: InventoryMode -> InventoryMode -> InventoryMode
 toggleInv x y 

src/Dodge/Event/Menu.hs

@@ -21,7 +21,7 @@ handlePressedKeyInMenu mState scode = case mState of
     TerminalScreen _ m  -> Just . (menuLayers %~ ( (TerminalScreen 0 m : ) . tail) )
     InputScreen s       -> case scode of
         ScancodeEscape  -> popScreen
-        ScancodeReturn  -> popScreen . (over uvWorld $ applyTerminalString s)
+        ScancodeReturn  -> popScreen . over uvWorld (applyTerminalString s)
         ScancodeBackspace 
             -> popScreen >=> pushScreen (InputScreen $ dropLast s)
         _   -> popScreen >=> pushScreen (InputScreen $ s ++ [scodeToChar scode])