summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2023-03-18 16:43:22 +0100
committerStanislaw Halik <sthalik@misaki.pl>2023-03-18 16:43:35 +0100
commitf82e612070b3edc963e787f121a58a2821ffa2a5 (patch)
treeedb1c32c2ed31f0ceddd76843a5aa5f33bd35d0d
parent6e7e8c4880b86d4477839cb087b34b4282e5516a (diff)
decruft
-rw-r--r--serialize/world-writer.cpp14
-rw-r--r--src/world.hpp2
2 files changed, 1 insertions, 15 deletions
diff --git a/serialize/world-writer.cpp b/serialize/world-writer.cpp
index 129a9e08..e04dad36 100644
--- a/serialize/world-writer.cpp
+++ b/serialize/world-writer.cpp
@@ -71,14 +71,6 @@ constexpr auto tile_size = sizeof(tilemeta) + (sizeof(atlasid) + sizeof(variant_
constexpr auto chunkbuf_size = sizeof(chunk_magic) + sizeof(chunk_coords) + tile_size * TILE_COUNT;
constexpr auto entity_size = std::max(sizeof(character), sizeof(scenery)) + character_name_max;
-#ifdef __GNUG__
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-#elif defined _MSC_VER
-#pragma warning(push)
-#pragma warning(disable : 4996)
-#endif
-
writer_state::writer_state(const world& world) : _world{&world}
{
chunk_buf.reserve(chunkbuf_size);
@@ -87,12 +79,6 @@ writer_state::writer_state(const world& world) : _world{&world}
scenery_map.reserve(64);
}
-#ifdef __GNUG__
-#pragma GCC diagnostic pop
-#elif defined _MSC_VER
-#pragma warning(pop)
-#endif
-
atlasid writer_state::intern_atlas(const tile_image_proto& img)
{
const void* const ptr = img.atlas.get();
diff --git a/src/world.hpp b/src/world.hpp
index 0b7b87a5..f29a83e2 100644
--- a/src/world.hpp
+++ b/src/world.hpp
@@ -60,7 +60,7 @@ public:
void maybe_collect();
std::size_t size() const noexcept { return _chunks.size(); }
- [[deprecated]] const auto& chunks() const noexcept { return _chunks; } // only for serialization
+ const auto& chunks() const noexcept { return _chunks; }
void serialize(StringView filename);
static world deserialize(StringView filename);