From 17a55dc7a71727a360cc642e7c55e7f2cf82d58a Mon Sep 17 00:00:00 2001
From: stuebinm <stuebinm@disroot.org>
Date: Wed, 8 Dec 2021 00:53:21 +0100
Subject: [PATCH] fix mapCopyright lint
(forgot that `error` is the builtin haskell function; the one to create
linter errors is called `complain`)
---
lib/Properties.hs | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/lib/Properties.hs b/lib/Properties.hs
index a4465d4..2747998 100644
--- a/lib/Properties.hs
+++ b/lib/Properties.hs
@@ -69,7 +69,7 @@ checkMap = do
$ complain "The map's tile size must be 32 by 32 pixels."
unlessHasProperty "mapCopyright"
- $ error "must give the map's copyright via the \"mapCopyright\" property."
+ $ complain "must give the map's copyright via the \"mapCopyright\" property."
-- | Checks a single property of a map.
--
@@ -117,8 +117,8 @@ checkTileset = do
when (isJust (tilesetSource tileset))
$ complain "Tilesets must be embedded and cannot be loaded from external files."
-- TODO: check copyright!
- unlessHasProperty "tiledCopyright"
- $ forbid "property \"tiledCopyright\" for tilesets must be set."
+ unlessHasProperty "tilesetCopyright"
+ $ forbid "property \"tilesetCopyright\" for tilesets must be set."
-- check individual tileset properties
mapM_ checkTilesetProperty (fromMaybe [] $ tilesetProperties tileset)
--
GitLab