diff options
Diffstat (limited to 'serialize')
| -rw-r--r-- | serialize/tile-atlas.cpp | 2 | ||||
| -rw-r--r-- | serialize/world-reader.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/serialize/tile-atlas.cpp b/serialize/tile-atlas.cpp index b56239c6..29a456dc 100644 --- a/serialize/tile-atlas.cpp +++ b/serialize/tile-atlas.cpp @@ -54,7 +54,7 @@ void adl_serializer<std::shared_ptr<tile_atlas>>::from_json(const json& j, std:: { int m = p2 ? int(*p2) : -1; const auto name = val->name(); - fm_throw("atlas {} wrong pass mode {} should be {}"_cf, StringView{name.data(), name.size()}, m, uint8_t(*p)); + fm_throw("atlas {} wrong pass mode {} should be {}"_cf, name, m, uint8_t(*p)); } } } diff --git a/serialize/world-reader.cpp b/serialize/world-reader.cpp index 0a99f74f..61c3984c 100644 --- a/serialize/world-reader.cpp +++ b/serialize/world-reader.cpp @@ -61,7 +61,7 @@ bool read_entity_flags(binary_reader<T>& s, U& e) uint8_t flags; flags << s; e.pass = pass_mode(flags & pass_mask); if (e.type != tag) - fm_abort("invalid entity type '%d'", (int)e.type); + fm_throw("invalid entity type '{}'"_cf, (int)e.type); if constexpr(tag == entity_type::scenery) { e.active = !!(flags & 1 << 2); @@ -368,7 +368,7 @@ world world::deserialize(StringView filename) FILE_raii f = ::fopen(filename.data(), "rb"); if (!f) { - fm_throw("fopen(\"{}\", \"r\"): {}"_cf, filename.data(), get_error_string(errbuf)); + fm_throw("fopen(\"{}\", \"r\"): {}"_cf, filename, get_error_string(errbuf)); } if (int ret = ::fseek(f, 0, SEEK_END); ret != 0) fm_throw("fseek(SEEK_END): {}"_cf, get_error_string(errbuf)); |