openboe/oboe
2
0
Fork 0
Code Issues 146 Pull Requests 4 Actions Packages Projects Releases Wiki Activity

expl is never used anywhere, so delete it

Browse Source 
Note: This will definitely break saved games
This commit is contained in:
Celtic Minstrel
2023-01-21 12:17:41 -05:00
parent 17dfbded57
commit c27403b3d7
2 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/universe/universe.cpp
View File

@@ -24,7 +24,7 @@
void cCurOut::import_legacy(legacy::out_info_type& old){ void cCurOut::import_legacy(legacy::out_info_type& old){
for(int i = 0; i < 96; i++) for(int i = 0; i < 96; i++)
for(int j = 0; j < 96; j++) 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){ 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 { void cCurOut::writeTo(std::ostream& file) const {
writeArray(file, expl, max_dim, max_dim);
writeArray(file, out, max_dim, max_dim); writeArray(file, out, max_dim, max_dim);
writeArray(file, out_e, max_dim, max_dim); writeArray(file, out_e, max_dim, max_dim);
// file << "OUTDOORS 0 0" << std::endl; // file << "OUTDOORS 0 0" << std::endl;
@@ -818,7 +817,6 @@ void cCurOut::writeTo(std::ostream& file) const {
} }
void cCurOut::readFrom(std::istream& file) { void cCurOut::readFrom(std::istream& file) {
readArray(file, expl, max_dim, max_dim);
readArray(file, out, max_dim, max_dim); readArray(file, out, max_dim, max_dim);
readArray(file, out_e, 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) { void cCurOut::copy(const cCurOut& other) {
memcpy(expl, other.expl, sizeof(expl));
memcpy(out, other.out, sizeof(out)); memcpy(out, other.out, sizeof(out));
memcpy(out_e, other.out_e, sizeof(out_e)); memcpy(out_e, other.out_e, sizeof(out_e));
} }

1
src/universe/universe.hpp
View File

@@ -140,7 +140,6 @@ class cCurOut {
public: public:
static const int max_dim = 96; static const int max_dim = 96;
static const int half_dim = max_dim / 2; 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]; ter_num_t out[max_dim][max_dim];
unsigned char out_e[max_dim][max_dim]; unsigned char out_e[max_dim][max_dim];