Merge remote-tracking branch 'upstream/master'

This commit is contained in:
dP
2020-07-09 11:00:11 +03:00

View File

@@ -53,7 +53,7 @@ void LoadCheckData::Clear()
this->map_size_x = this->map_size_y = 256; // Default for old savegames which do not store mapsize.
this->current_date = 0;
memset(&this->settings, 0, sizeof(this->settings));
this->settings = {}; // CM memset(&this->settings, 0, sizeof(this->settings));
for (auto &pair : this->companies) {
delete pair.second;