diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2023-11-22 16:24:13 +0100 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2023-11-22 16:24:13 +0100 |
| commit | 4c85fde68f0819aaf2663f23c8a6d5496ae389c6 (patch) | |
| tree | 40ab18f7d7e3ce7ccdcc8ba83dc62c1c56f3bdc4 | |
| parent | 2611db2643d3d02816c24260b8d918655d07ec88 (diff) | |
fix snafu harder
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | loader/loader.cpp | 2 | ||||
| -rw-r--r-- | walls/walls.json | 3 |
3 files changed, 5 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 1411d2e9..fa133da6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -270,7 +270,7 @@ endfunction() function(fm_install_assets) set(CMAKE_INSTALL_MESSAGE NEVER) - foreach(subdir images anim scenery vobj wall-tilesets) + foreach(subdir images anim scenery vobj walls) fm_install_kill_directory("${subdir}") install(DIRECTORY "${subdir}" DESTINATION "share/floormat") endforeach() diff --git a/loader/loader.cpp b/loader/loader.cpp index a89cadab..71be9b16 100644 --- a/loader/loader.cpp +++ b/loader/loader.cpp @@ -42,6 +42,6 @@ const StringView loader_::ANIM_PATH = "anim/"_s; const StringView loader_::SCENERY_PATH = "scenery/"_s; const StringView loader_::TEMP_PATH = "../../../"_s; const StringView loader_::VOBJ_PATH = "vobj/"_s; -const StringView loader_::WALL_TILESET_PATH = "wall-tilesets/"_s; +const StringView loader_::WALL_TILESET_PATH = "walls/"_s; } // namespace floormat diff --git a/walls/walls.json b/walls/walls.json new file mode 100644 index 00000000..0745e31a --- /dev/null +++ b/walls/walls.json @@ -0,0 +1,3 @@ +[ + { "name": "concrete1" } +] |