Cleanup

src/Dodge/Item/Location.hs

@@ -1,7 +1,6 @@
 module Dodge.Item.Location (
     pointerToItemID,
     pointerToItemLocation,
-    getItem,
     pointerToItem,
     pointerYourSelectedItem,
     pointerYourRootItem,
@@ -12,16 +11,6 @@ import Control.Lens
 import Data.Maybe
 import Dodge.Data.World
 
-getItem :: Int -> World -> Maybe Item
-getItem itid w = do
-    itpos <- w ^? cWorld . lWorld . itemLocations . ix itid
-    case itpos of
-        OnFloor flitid -> w ^? cWorld . lWorld . floorItems . unNIntMap . ix (_unNInt flitid) . flIt
-        InInv {_ilCrID = cid, _ilInvID = invid} 
-            -> w ^? cWorld . lWorld . creatures . ix cid . crInv . ix invid
-        OnTurret mcid -> w ^? cWorld . lWorld . machines . ix mcid . mcType . _McTurret . tuWeapon
-        InVoid -> Nothing
-
 pointerToItemLocation ::
     Applicative f =>
     ItemLocation ->

src/Dodge/Item/Weapon.hs

@@ -4,11 +4,9 @@ module Dodge.Item.Weapon (
     module Dodge.Item.Weapon.ExtraEffect,
     module Dodge.Item.Weapon.Radar,
     module Dodge.Item.Weapon.Utility,
---    module Dodge.Item.Weapon.BatteryGuns,
     module Dodge.Item.Weapon.Drone,
 ) where
 
---import Dodge.Item.Weapon.BatteryGuns
 import Dodge.Item.Weapon.Drone
 import Dodge.Item.Weapon.ExtraEffect
 import Dodge.Item.Weapon.Radar