From 3d0fc2d0ed474f2718b217b649cfdb3642d67e9b Mon Sep 17 00:00:00 2001 From: Karl Ostmo Date: Mon, 11 Dec 2023 19:45:18 -0800 Subject: [PATCH] Remove char arg --- src/Swarm/Game/Display.hs | 6 +++--- src/Swarm/Game/Terrain.hs | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/Swarm/Game/Display.hs b/src/Swarm/Game/Display.hs index 1291714b1..a017fed35 100644 --- a/src/Swarm/Game/Display.hs +++ b/src/Swarm/Game/Display.hs @@ -177,9 +177,9 @@ hidden = (defaultChar .~ '?') . (curOrientation .~ Nothing) -- | The default way to display some terrain using the given character -- and attribute, with priority 0. -defaultTerrainDisplay :: Char -> Attribute -> Display -defaultTerrainDisplay c attr = - defaultEntityDisplay c +defaultTerrainDisplay :: Attribute -> Display +defaultTerrainDisplay attr = + defaultEntityDisplay ' ' & displayPriority .~ 0 & displayAttr .~ attr diff --git a/src/Swarm/Game/Terrain.hs b/src/Swarm/Game/Terrain.hs index 72af2177c..d10d27a00 100644 --- a/src/Swarm/Game/Terrain.hs +++ b/src/Swarm/Game/Terrain.hs @@ -59,9 +59,9 @@ getTerrainWord = T.toLower . T.pack . init . show terrainMap :: Map TerrainType Display terrainMap = M.fromList - [ (StoneT, defaultTerrainDisplay ' ' (ATerrain "stone")) - , (DirtT, defaultTerrainDisplay ' ' (ATerrain "dirt")) - , (GrassT, defaultTerrainDisplay ' ' (ATerrain "grass")) - , (IceT, defaultTerrainDisplay ' ' (ATerrain "ice")) - , (BlankT, defaultTerrainDisplay ' ' ADefault) + [ (StoneT, defaultTerrainDisplay (ATerrain "stone")) + , (DirtT, defaultTerrainDisplay (ATerrain "dirt")) + , (GrassT, defaultTerrainDisplay (ATerrain "grass")) + , (IceT, defaultTerrainDisplay (ATerrain "ice")) + , (BlankT, defaultTerrainDisplay ADefault) ]