Cleanup warnings

src/Dodge/Event.hs

@@ -14,21 +14,21 @@ module Dodge.Event
     ( handleEvent
     ) where
 import Dodge.Event.Keyboard
-import Dodge.Event.Menu
+--import Dodge.Event.Menu
 import Dodge.Data
 import Dodge.Base
-import Dodge.Creature.Action
+--import Dodge.Creature.Action
 import Dodge.SoundLogic
 import Dodge.Inventory
 import Dodge.Config.Data
-import Geometry
+--import Geometry
 import Preload.Update
 
 import Control.Lens
 import Data.Maybe
-import Data.Char
-import Data.List
-import Data.Function (on)
+--import Data.Char
+--import Data.List
+--import Data.Function (on)
 import qualified Data.Set as S
 import qualified Data.IntMap.Strict as IM
 import SDL
@@ -61,11 +61,12 @@ handleMouseButtonEvent mbev w = case mouseButtonEventMotion mbev of
 
 handleMouseWheelEvent :: MouseWheelEventData -> World -> Maybe World
 handleMouseWheelEvent mwev w = case _menuLayers w of
-   [] -> case mouseWheelEventPos mwev of
-        V2 x y | y > 0      -> Just (wheelUpEvent w)
-               | y < 0      -> Just (wheelDownEvent w)
-               | otherwise  -> Just w
-   _ -> Just w
+    [] -> case mouseWheelEventPos mwev of
+        V2 _ y 
+            | y > 0      -> Just (wheelUpEvent w)
+            | y < 0      -> Just (wheelDownEvent w)
+            | otherwise  -> Just w
+    _ -> Just w
 
 {- |
 Resets the world window size, and resizes the fbo that gets the light map drawn into it.
@@ -123,20 +124,12 @@ wheelDownEvent w = case _carteDisplay w of
     numLocs = (fst . IM.findMax $ _seenLocations w) + 1
 
 upInvPos :: World -> World
-upInvPos w = stopSoundFrom (CrReloadSound 0) $ set (creatures . ix (_yourID w) . crInvSel) x w
+upInvPos w = stopSoundFrom (CrReloadSound 0) $ w
+    & creatures . ix (_yourID w) . crInvSel %~ (`mod` n) . (subtract 1)
   where 
-    is = IM.keys $ _crInv $ _creatures w IM.! _yourID w
-    isis = is ++ is
-    x = before (_crInvSel (you w)) isis
+    n = length $ IM.keys $ _crInv $ _creatures w IM.! _yourID w
 downInvPos :: World -> World
-downInvPos w = stopSoundFrom (CrReloadSound 0) $ set (creatures . ix (_yourID w) . crInvSel) x w
+downInvPos w = stopSoundFrom (CrReloadSound 0) $ w
+    & creatures . ix (_yourID w) . crInvSel %~ (`mod` n) . (+ 1)
   where 
-    is = IM.keys $ _crInv $ _creatures w IM.! _yourID w
-    isis = is ++ is
-    x = after (_crInvSel (you w)) isis
-
--- these are incomplete: should put in error case here!
-before y (x:z:ys) | y == z    = x
-                  | otherwise = before y (z:ys)
-after y (x:z:ys)  | y == x    = z
-                  | otherwise = after y (z:ys)
+    n = length $ IM.keys $ _crInv $ _creatures w IM.! _yourID w