From 8c7e2b8114016b9e49ab390981d13ad86af20178 Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Tue, 27 Feb 2024 16:52:05 +0100 Subject: serialize: fix shadowed variable warning --- serialize/savegame.cpp | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'serialize') diff --git a/serialize/savegame.cpp b/serialize/savegame.cpp index eea89a03..c737db57 100644 --- a/serialize/savegame.cpp +++ b/serialize/savegame.cpp @@ -549,28 +549,28 @@ ok: do_visit(c.coord(), f); // todo do atlases and variants separately for (uint32_t i = 0; i < TILE_COUNT; i++) - serialize_tile_([&](uint32_t i) { - return maybe_intern_atlas(c[i].ground_atlas(), atlas_type::ground); + serialize_tile_([&](uint32_t index) { + return maybe_intern_atlas(c[index].ground_atlas(), atlas_type::ground); }, i, f); for (uint32_t i = 0; i < TILE_COUNT; i++) - serialize_tile_([&](uint32_t i) { - return maybe_intern_atlas(c[i].wall_north_atlas(), atlas_type::wall); + serialize_tile_([&](uint32_t index) { + return maybe_intern_atlas(c[index].wall_north_atlas(), atlas_type::wall); }, i, f); for (uint32_t i = 0; i < TILE_COUNT; i++) - serialize_tile_([&](uint32_t i) { - return maybe_intern_atlas(c[i].wall_west_atlas(), atlas_type::wall); + serialize_tile_([&](uint32_t index) { + return maybe_intern_atlas(c[index].wall_west_atlas(), atlas_type::wall); }, i, f); for (uint32_t i = 0; i < TILE_COUNT; i++) - serialize_tile_([&](uint32_t i) { - auto v = c[i].ground().variant; return v == (variant_t)-1 ? null : v; + serialize_tile_([&](uint32_t index) { + auto v = c[index].ground().variant; return v == (variant_t)-1 ? null : v; }, i, f); for (uint32_t i = 0; i < TILE_COUNT; i++) - serialize_tile_([&c](uint32_t i) { - auto v = c[i].wall_north().variant; return v == (variant_t)-1 ? null : v; + serialize_tile_([&c](uint32_t index) { + auto v = c[index].wall_north().variant; return v == (variant_t)-1 ? null : v; }, i, f); for (uint32_t i = 0; i < TILE_COUNT; i++) - serialize_tile_([&c](uint32_t i) { - auto v = c[i].wall_west().variant; return v == (variant_t)-1 ? null : v; + serialize_tile_([&c](uint32_t index) { + auto v = c[index].wall_west().variant; return v == (variant_t)-1 ? null : v; }, i, f); serialize_objects_(c, f); -- cgit v1.2.3