From c9e889723b7af832322d178975e6e440d6cd3ae5 Mon Sep 17 00:00:00 2001 From: LDA Date: Mon, 26 Jun 2023 11:48:27 -0700 Subject: resolved most of the compiler warnings/errors under gcc also update xxhash and tinyformat --- source/utility/update_tilesets.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source/utility/update_tilesets.cpp') diff --git a/source/utility/update_tilesets.cpp b/source/utility/update_tilesets.cpp index f21f886..e5b850b 100644 --- a/source/utility/update_tilesets.cpp +++ b/source/utility/update_tilesets.cpp @@ -111,7 +111,7 @@ void defineObjectOrientation(TilesetUpdater& updater, List layers; unsigned width = 0, height = 0; for (auto const& imageLayer : orientation->imageLayers) { - String imageName = imageLayer.imagePart().image.replaceTags(StringMap{}, true, "default"); + String imageName = AssetPath::join(imageLayer.imagePart().image).replaceTags(StringMap{}, true, "default"); ImageConstPtr image = assets->image(imageName); layers.append(image); -- cgit v1.2.3