mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-26 09:35:28 +00:00
Code Issues Projects Releases Wiki Activity

Discard old save game weather records

Browse Source
This commit is contained in:
slothlife 2015-08-27 09:57:32 -05:00
parent c907ed517d
commit 7817c52cbb
2 changed files with 31 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
apps/openmw/mwworld/weather.cpp
View File

@ -5,7 +5,9 @@
#include <components/misc/rng.hpp> #include <components/misc/rng.hpp>
#include <components/esm/esmreader.hpp>
#include <components/esm/esmwriter.hpp> #include <components/esm/esmwriter.hpp>
#include <components/esm/savedgame.hpp>
#include <components/esm/weatherstate.hpp> #include <components/esm/weatherstate.hpp>
#include "../mwbase/environment.hpp" #include "../mwbase/environment.hpp"
@ -723,30 +725,39 @@ bool WeatherManager::readRecord(ESM::ESMReader& reader, uint32_t type)
{ {
if(ESM::REC_WTHR == type) if(ESM::REC_WTHR == type)
{ {
ESM::WeatherState state; if(reader.getFormat() < ESM::SavedGame::sCurrentFormat)
state.load(reader);
mCurrentRegion.swap(state.mCurrentRegion);
mTimePassed = state.mTimePassed;
mFastForward = state.mFastForward;
mWeatherUpdateTime = state.mWeatherUpdateTime;
mTransitionFactor = state.mTransitionFactor;
mCurrentWeather = state.mCurrentWeather;
mNextWeather = state.mCurrentWeather;
mQueuedWeather = state.mQueuedWeather;
mRegions.clear();
std::map<std::string, ESM::RegionWeatherState>::iterator it = state.mRegions.begin();
if(it == state.mRegions.end())
{ {
// When loading an imported save, the region modifiers aren't currently being set, so just reset them. // Weather state isn't really all that important, so to preserve older save games, we'll just discard the
importRegions(); // older weather records, rather than fail to handle the record.
reader.skipRecord();
} }
else else
{ {
for(; it != state.mRegions.end(); ++it) ESM::WeatherState state;
state.load(reader);
mCurrentRegion.swap(state.mCurrentRegion);
mTimePassed = state.mTimePassed;
mFastForward = state.mFastForward;
mWeatherUpdateTime = state.mWeatherUpdateTime;
mTransitionFactor = state.mTransitionFactor;
mCurrentWeather = state.mCurrentWeather;
mNextWeather = state.mCurrentWeather;
mQueuedWeather = state.mQueuedWeather;
mRegions.clear();
std::map<std::string, ESM::RegionWeatherState>::iterator it = state.mRegions.begin();
if(it == state.mRegions.end())
{ {
mRegions.insert(std::make_pair(it->first, RegionWeather(it->second))); // When loading an imported save, the region modifiers aren't currently being set, so just reset them.
importRegions();
}
else
{
for(; it != state.mRegions.end(); ++it)
{
mRegions.insert(std::make_pair(it->first, RegionWeather(it->second)));
}
} }
} }

2
components/esm/savedgame.cpp
View File

@ -5,7 +5,7 @@
#include "defs.hpp" #include "defs.hpp"
unsigned int ESM::SavedGame::sRecordId = ESM::REC_SAVE; unsigned int ESM::SavedGame::sRecordId = ESM::REC_SAVE;
int ESM::SavedGame::sCurrentFormat = 1; int ESM::SavedGame::sCurrentFormat = 2;
void ESM::SavedGame::load (ESMReader &esm) void ESM::SavedGame::load (ESMReader &esm)
{ {