Linting, haddocking

src/Dodge/Base.hs

@@ -3,6 +3,7 @@
 module Dodge.Base where
 -- imports {{{
 import Dodge.Data
+import Dodge.Config.Data
 
 import Geometry
 import Picture
@@ -52,8 +53,11 @@ yourItem w = _crInv (you w) IM.! _crInvSel (you w)
 yourItemRef w = (creatures . ix (_yourID w) . crInv . ix (_crInvSel (you w)))
 
 halfWidth,halfHeight :: World -> Float
-halfWidth w = _windowX w / 2
-halfHeight w = _windowY w / 2
+halfWidth w = getWindowX w / 2
+halfHeight w = getWindowY w / 2
+
+getWindowX = _windowX . _config
+getWindowY = _windowY . _config
 
 hasLOS :: Point2 -> Point2 -> World -> Bool
 {-# INLINE hasLOS #-}
@@ -317,7 +321,7 @@ zoneOfScreen w = [(a,b) | a <- [x - n .. x + n]
                  ]
     where (x,y) = zoneOfPoint $ _cameraCenter w
           n = ceiling $ wh / (_cameraZoom w * zoneSize)
-          wh = max (_windowX w) (_windowY w)
+          wh = max (getWindowX w) (getWindowY w)
 
 zoneOfDoubleScreen :: World -> [(Int,Int)]
 zoneOfDoubleScreen w = [(a,b) | a <- [x - n .. x + n]
@@ -325,7 +329,7 @@ zoneOfDoubleScreen w = [(a,b) | a <- [x - n .. x + n]
                  ]
     where (x,y) = zoneOfPoint $ _cameraCenter w
           n = (ceiling $ wh / (_cameraZoom w * zoneSize)) * 2
-          wh = max (_windowX w) (_windowY w)
+          wh = max (getWindowX w) (getWindowY w)
 
 zoneOfSight :: World -> [(Int,Int)]
 zoneOfSight w = [(a,b) | a <- [minimum xs .. maximum xs]
@@ -786,8 +790,8 @@ worldPosToScreen w = doWindowScale . doRotate . doZoom . doTranslate
     doTranslate p       =   p -.- _cameraCenter w
     doZoom p            =   _cameraZoom w *.* p
     doRotate p          =   rotateV (0 - _cameraRot w) p
-    doWindowScale (x,y) =   ( x * 2 / _windowX w
-                            , y * 2 / _windowY w
+    doWindowScale (x,y) =   ( x * 2 / getWindowX w
+                            , y * 2 / getWindowY w
                             )
 
 {- | Transform coordinates from the map position to normalised screen
@@ -799,8 +803,8 @@ cartePosToScreen w = doWindowScale . doRotate . doZoom . doTranslate
     doTranslate p       =   p -.- _carteCenter w
     doZoom p            =   _carteZoom w *.* p
     doRotate p          =   rotateV (0 - _carteRot w) p
-    doWindowScale (x,y) =   ( x * 2 / _windowX w
-                            , y * 2 / _windowY w
+    doWindowScale (x,y) =   ( x * 2 / getWindowX w
+                            , y * 2 / getWindowY w
                             )
 
 {- | The mouse position in world coordinates.