From c27403b3d71607d073ee27823be2482f34e65c4a Mon Sep 17 00:00:00 2001 From: Celtic Minstrel Date: Sat, 21 Jan 2023 12:17:41 -0500 Subject: [PATCH] expl is never used anywhere, so delete it Note: This will definitely break saved games --- src/universe/universe.cpp | 5 +---- src/universe/universe.hpp | 1 - 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/src/universe/universe.cpp b/src/universe/universe.cpp index aad4dcd3..ccaf54f9 100644 --- a/src/universe/universe.cpp +++ b/src/universe/universe.cpp @@ -24,7 +24,7 @@ void cCurOut::import_legacy(legacy::out_info_type& old){ for(int i = 0; i < 96; i++) for(int j = 0; j < 96; j++) - expl[i][j] = old.expl[i][j]; + out_e[i][j] = old.expl[i][j]; } void cCurTown::import_legacy(legacy::current_town_type& old){ @@ -803,7 +803,6 @@ ter_num_t& cCurOut::operator [] (location loc) { } void cCurOut::writeTo(std::ostream& file) const { - writeArray(file, expl, max_dim, max_dim); writeArray(file, out, max_dim, max_dim); writeArray(file, out_e, max_dim, max_dim); // file << "OUTDOORS 0 0" << std::endl; @@ -818,7 +817,6 @@ void cCurOut::writeTo(std::ostream& file) const { } void cCurOut::readFrom(std::istream& file) { - readArray(file, expl, max_dim, max_dim); readArray(file, out, max_dim, max_dim); readArray(file, out_e, max_dim, max_dim); } @@ -969,7 +967,6 @@ void cUniverse::swap(cUniverse& other) { } void cCurOut::copy(const cCurOut& other) { - memcpy(expl, other.expl, sizeof(expl)); memcpy(out, other.out, sizeof(out)); memcpy(out_e, other.out_e, sizeof(out_e)); } diff --git a/src/universe/universe.hpp b/src/universe/universe.hpp index aa280948..b7f77fd9 100644 --- a/src/universe/universe.hpp +++ b/src/universe/universe.hpp @@ -140,7 +140,6 @@ class cCurOut { public: static const int max_dim = 96; static const int half_dim = max_dim / 2; - char expl[max_dim][max_dim]; // formerly out_info_type ter_num_t out[max_dim][max_dim]; unsigned char out_e[max_dim][max_dim];