From fb914871bf169e8cd6f74cc086cabd5b23e6f739 Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Sat, 22 Oct 2022 23:22:06 +0200 Subject: stuff --- main/draw.cpp | 2 +- serialize/json-helper.hpp | 1 - serialize/world.cpp | 10 ++++------ 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/main/draw.cpp b/main/draw.cpp index 5ee38fba..e634823f 100644 --- a/main/draw.cpp +++ b/main/draw.cpp @@ -58,7 +58,7 @@ void app::draw_world() for (std::int16_t y = miny; y <= maxy; y++) for (std::int16_t x = minx; x <= maxx; x++) { -#if 0 +#if 1 if (const chunk_coords c = {x, y}; !_world.contains(c)) make_test_chunk(*_world[c]); #endif diff --git a/serialize/json-helper.hpp b/serialize/json-helper.hpp index b1502295..c6dadf53 100644 --- a/serialize/json-helper.hpp +++ b/serialize/json-helper.hpp @@ -4,7 +4,6 @@ #include #include #include -#include struct json_helper final { template diff --git a/serialize/world.cpp b/serialize/world.cpp index 835a80f8..8b6f84d7 100644 --- a/serialize/world.cpp +++ b/serialize/world.cpp @@ -7,10 +7,12 @@ #include #include -#ifdef __GNUG__ -#pragma GCC diagnostic push +#if defined _MSC_VER +#pragma warning(disable : 4996) +#elif defined __GNUG__ #pragma GCC diagnostic ignored "-Wdeprecated-declarations" #endif + namespace floormat { NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE(chunk_coords, x, y) @@ -70,7 +72,3 @@ void adl_serializer::from_json(const json& j, world& val) } } // namespace nlohmann - -#ifdef __GNUG__ -#pragma GCC diagnostic pop -#endif -- cgit v1.2.3