Refactor, try to limit dependencies

2022-07-28 00:59:56 +01:00
parent 8aa5c17ab9
commit 160560af5f
418 changed files with 15104 additions and 13342 deletions
@@ -1,13 +1,15 @@
 module Dodge.Inventory.CloseObject where
-import Dodge.Data
+
+import Dodge.Data.Button
+import Dodge.Data.FloorItem
 import Geometry

 closeObjPos :: Either FloorItem Button -> Point2
 closeObjPos e = case e of
    Right x -> _btPos x
-    Left x  -> _flItPos x
+    Left x -> _flItPos x

 closeObjEq :: Either FloorItem Button -> Either FloorItem Button -> Bool
-closeObjEq (Right x) (Right y) = _btID x   == _btID y
-closeObjEq (Left x)  (Left y)  = _flItID x == _flItID y
+closeObjEq (Right x) (Right y) = _btID x == _btID y
+closeObjEq (Left x) (Left y) = _flItID x == _flItID y
 closeObjEq _ _ = False