Add Read instances

src/Dodge/Render/HUD.hs

@@ -3,6 +3,7 @@ module Dodge.Render.HUD
     ( hudDrawings
     ) where
 import Dodge.Data
+import Dodge.Tweak.Show
 import Dodge.Item.Display
 import Dodge.Combine
 import Dodge.Clock
@@ -79,11 +80,9 @@ subInventoryDisplay subinv cfig w = case subinv of
         , fromMaybe mempty $ do
             tweaki <-  it ^? _Just . itTweaks . tweakSel
                 -- consider moving this functionality out into a tweaks module
-            showtweak <- it ^? _Just . itTweaks . tweakParams . ix tweaki . showTweak
-            tweakname <- it ^? _Just . itTweaks . tweakParams . ix tweaki . nameTweak
-            tweakstring <- showtweak <$> (it ^? _Just . itTweaks . tweakParams . ix tweaki . curTweak)
+            tparam <- it ^? _Just . itTweaks . tweakParams . ix tweaki
             return $ lnkMidInvSel cfig w curpos tweaki
-                <> listCursorNSW subInvX 60 cfig tweaki white (length $ tweakstring ++ tweakname) 1
+                <> listCursorNSW subInvX 60 cfig tweaki white (length $ showTweak tparam) 1
         , invHead cfig "TWEAK"
         , listPicturesAt subInvX 60 cfig $ map text (ammoTweakStrings it)
         ]
@@ -269,7 +268,7 @@ ammoTweakStrings it = case it ^? _Just . itTweaks . tweakParams of
     _ -> ["NOT TWEAKABLE"]
 
 tweakString :: TweakParam -> String
-tweakString tp = rightPad 12 ' ' (_nameTweak tp) ++ " " ++ _showTweak tp (_curTweak tp)
+tweakString tp = rightPad 12 ' ' (show $ _tweakType tp) ++ " " ++ showTweak tp
 
 invHead :: Configuration -> String -> Picture
 invHead cfig s = winScale cfig 

src/Dodge/Render/Walls.hs

@@ -2,6 +2,7 @@ module Dodge.Render.Walls
     ( wallsToDraw
     ) where
 import Dodge.Data
+import Dodge.Wall.Draw
 import Dodge.Zone
 import Dodge.Base.Wall
 import Geometry
@@ -36,7 +37,7 @@ wlSeeThroughDraw wl = wlIsSeeThrough wl && _wlHeight wl == 100
 getWallSPic :: Wall -> SPic
 getWallSPic wl = case wl ^? wlOpacity . opDraw of
     Nothing -> mempty
-    Just f  -> f wl
+    Just f  -> drawWall f wl
 
 --    (wins,wls) = partition theTest . IM.elems . IM.filter _wlUnshadowed $ wallsDoubleScreen cfig w
 --    theTest wl = case _wlOpacity wl of