diff options
author | LDA <lda@ldasuku.net> | 2023-06-26 11:48:27 -0700 |
---|---|---|
committer | LDA <lda@ldasuku.net> | 2023-06-26 11:58:35 -0700 |
commit | c9e889723b7af832322d178975e6e440d6cd3ae5 (patch) | |
tree | a8429c30ecf46ed1388df13b614141e73973cd9f /source/utility | |
parent | 4585c9cafa87cad6b54397af7e9375cc31b72f89 (diff) |
resolved most of the compiler warnings/errors under gcc
also update xxhash and tinyformat
Diffstat (limited to 'source/utility')
-rw-r--r-- | source/utility/update_tilesets.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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<ImageConstPtr> layers; unsigned width = 0, height = 0; for (auto const& imageLayer : orientation->imageLayers) { - String imageName = imageLayer.imagePart().image.replaceTags(StringMap<String>{}, true, "default"); + String imageName = AssetPath::join(imageLayer.imagePart().image).replaceTags(StringMap<String>{}, true, "default"); ImageConstPtr image = assets->image(imageName); layers.append(image); |