diff options
author | Stanislaw Halik <sthalik@misaki.pl> | 2024-02-07 23:38:31 +0100 |
---|---|---|
committer | Stanislaw Halik <sthalik@misaki.pl> | 2024-02-08 08:43:49 +0100 |
commit | a6514d1a95d0f84f0935866215463ef6aed23e19 (patch) | |
tree | 639075646b1ea42a3cd4a76ae59af7dda0c4b14a /loader/atlas.cpp | |
parent | 4575194adb4615deeca174044a872093c3664ad4 (diff) |
loader: work toward removing duplicate atlas code
Diffstat (limited to 'loader/atlas.cpp')
-rw-r--r-- | loader/atlas.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/loader/atlas.cpp b/loader/atlas.cpp index a4c38264..e856f639 100644 --- a/loader/atlas.cpp +++ b/loader/atlas.cpp @@ -1,6 +1,7 @@ #include "impl.hpp" //#include "compat/assert.hpp" #include "compat/exception.hpp" +#include "loader/loader.hpp" //#include "src/emplacer.hpp" //#include "src/anim-atlas.hpp" #include <cstring> @@ -13,11 +14,11 @@ namespace floormat { -StringView loader_::make_atlas_path(char(&buf)[FILENAME_MAX], StringView dir, StringView name) +StringView loader_::make_atlas_path(char(&buf)[fm_FILENAME_MAX], StringView dir, StringView name) { fm_soft_assert(!dir || dir[dir.size()-1] == '/'); const auto dirsiz = dir.size(), namesiz = name.size(); - fm_soft_assert(dirsiz + namesiz + 1 < FILENAME_MAX); + fm_soft_assert(dirsiz + namesiz + 1 < fm_FILENAME_MAX); std::memcpy(buf, dir.data(), dirsiz); std::memcpy(&buf[dirsiz], name.data(), namesiz); auto len = dirsiz + namesiz; |