summaryrefslogtreecommitdiffhomepage
path: root/serialize/world-reader.cpp
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2023-03-19 00:03:12 +0100
committerStanislaw Halik <sthalik@misaki.pl>2023-03-19 00:03:46 +0100
commitf3f99d56ad6cd66e74e6958d46a12cc56f584984 (patch)
tree4206d13f3091f822d7ee3b34ced82163ed7f50cf /serialize/world-reader.cpp
parent4d9a82b720c8ce74b94f43f72ddd819ef21abbdf (diff)
move some deserialize path's asserts to soft asserts
Diffstat (limited to 'serialize/world-reader.cpp')
-rw-r--r--serialize/world-reader.cpp4
1 files changed, 2 insertions, 2 deletions
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));