summaryrefslogtreecommitdiff
path: root/lib/Properties.hs
diff options
context:
space:
mode:
authorstuebinm2022-03-19 20:20:20 +0100
committerstuebinm2022-03-19 20:21:14 +0100
commit80cc9d0f70e98ff9b8aa78c86891d4a9bb4759d5 (patch)
tree0c0151ebfa7b7b87b4906532b93452afb1dd39a8 /lib/Properties.hs
parentdbf2253dc4256809b255767cbf4ae9c236f18542 (diff)
unbreak a very, very long rebase
Diffstat (limited to 'lib/Properties.hs')
-rw-r--r--lib/Properties.hs9
1 files changed, 4 insertions, 5 deletions
diff --git a/lib/Properties.hs b/lib/Properties.hs
index b937534..f645392 100644
--- a/lib/Properties.hs
+++ b/lib/Properties.hs
@@ -20,11 +20,11 @@ import qualified Data.Text as T
import Data.Tiled (Layer (..), Object (..), Property (..),
PropertyValue (..), Tile (..),
Tiledmap (..), Tileset (..))
-import Data.Tiled.Abstract (HasName (..), HasProperties (..),
- HasTypeName (..), IsProperty (..))
+import Data.Tiled.Abstract (HasData (..), HasName (..),
+ HasProperties (..), HasTypeName (..),
+ IsProperty (..), layerIsEmpty)
import qualified Data.Vector as V
-import Util (layerIsEmpty, mkProxy, naiveEscapeHTML,
- prettyprint)
+import Util (mkProxy, naiveEscapeHTML, prettyprint)
import Badges (Badge (Badge),
BadgeArea (BadgePoint, BadgeRect),
@@ -424,7 +424,6 @@ checkTileThing removeExits p@(Property name _value) = case name of
complain "All exit links must link to .json files."
| otherwise -> dependsOn . LocalMap $ path
else do
- removeProperty "exitUrl"
warn "exitUrls in Tilesets are not properly supported; if you want to add an \
\exit, please use a tile layer instead."
"exitSceneUrl" ->