diff options
Diffstat (limited to 'serialize/tile-atlas.cpp')
| -rw-r--r-- | serialize/tile-atlas.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/serialize/tile-atlas.cpp b/serialize/tile-atlas.cpp index 3918d5b0..3d8c7d2f 100644 --- a/serialize/tile-atlas.cpp +++ b/serialize/tile-atlas.cpp @@ -10,12 +10,11 @@ #include <nlohmann/json.hpp> using namespace floormat; -using namespace std::string_view_literals; namespace { struct proxy { - String name; + StringView name; Vector2ub size; Optional<pass_mode> passability; }; @@ -35,7 +34,7 @@ void adl_serializer<std::shared_ptr<tile_atlas>>::to_json(json& j, const std::sh { to_json(j, proxy{x->name(), x->num_tiles2(), NullOpt}); if (auto p = x->pass_mode()) - j["pass-mode"sv] = *p; + j["pass-mode"] = *p; } } @@ -49,8 +48,8 @@ void adl_serializer<std::shared_ptr<tile_atlas>>::from_json(const json& j, std:: proxy x; from_json(j, x); Optional<pass_mode> p; - if (j.contains("pass-mode"sv)) - p = {InPlaceInit, j["pass-mode"sv]}; + if (j.contains("pass-mode")) + p = {InPlaceInit, j["pass-mode"]}; val = loader.tile_atlas(x.name, x.size, p); if (auto p2 = val->pass_mode(); p && p2 != p) { |