1
0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-03-25 16:43:33 +00:00

Drop support for save game format 1

This commit is contained in:
Evil Eye 2023-12-09 17:22:11 +01:00
parent 102d2c4b43
commit 521cff08f8
3 changed files with 20 additions and 32 deletions

View File

@ -897,14 +897,6 @@ namespace MWWorld
bool WeatherManager::readRecord(ESM::ESMReader& reader, uint32_t type) bool WeatherManager::readRecord(ESM::ESMReader& reader, uint32_t type)
{ {
if (ESM::REC_WTHR == type) if (ESM::REC_WTHR == type)
{
if (reader.getFormatVersion() <= ESM::MaxOldWeatherFormatVersion)
{
// Weather state isn't really all that important, so to preserve older save games, we'll just discard
// the older weather records, rather than fail to handle the record.
reader.skipRecord();
}
else
{ {
ESM::WeatherState state; ESM::WeatherState state;
state.load(reader); state.load(reader);
@ -929,7 +921,6 @@ namespace MWWorld
found->second = RegionWeather(it->second); found->second = RegionWeather(it->second);
} }
} }
}
return true; return true;
} }

View File

@ -49,8 +49,6 @@ namespace ESM
esm.getHNOT(mTalkedTo, "TALK"); esm.getHNOT(mTalkedTo, "TALK");
esm.getHNOT(mAlarmed, "ALRM"); esm.getHNOT(mAlarmed, "ALRM");
esm.getHNOT(mAttacked, "ATKD"); esm.getHNOT(mAttacked, "ATKD");
if (esm.isNextSub("ATCK"))
esm.skipHSub(); // attackingOrSpell, no longer used
esm.getHNOT(mKnockdown, "KNCK"); esm.getHNOT(mKnockdown, "KNCK");
esm.getHNOT(mKnockdownOneFrame, "KNC1"); esm.getHNOT(mKnockdownOneFrame, "KNC1");
esm.getHNOT(mKnockdownOverOneFrame, "KNCO"); esm.getHNOT(mKnockdownOverOneFrame, "KNCO");

View File

@ -9,7 +9,6 @@ namespace ESM
inline constexpr FormatVersion DefaultFormatVersion = 0; inline constexpr FormatVersion DefaultFormatVersion = 0;
inline constexpr FormatVersion CurrentContentFormatVersion = 1; inline constexpr FormatVersion CurrentContentFormatVersion = 1;
inline constexpr FormatVersion MaxOldWeatherFormatVersion = 1;
inline constexpr FormatVersion MaxOldDeathAnimationFormatVersion = 2; inline constexpr FormatVersion MaxOldDeathAnimationFormatVersion = 2;
inline constexpr FormatVersion MaxOldFogOfWarFormatVersion = 6; inline constexpr FormatVersion MaxOldFogOfWarFormatVersion = 6;
inline constexpr FormatVersion MaxUnoptimizedCharacterDataFormatVersion = 7; inline constexpr FormatVersion MaxUnoptimizedCharacterDataFormatVersion = 7;
@ -28,7 +27,7 @@ namespace ESM
inline constexpr FormatVersion MaxActiveSpellSlotIndexFormatVersion = 27; inline constexpr FormatVersion MaxActiveSpellSlotIndexFormatVersion = 27;
inline constexpr FormatVersion CurrentSaveGameFormatVersion = 29; inline constexpr FormatVersion CurrentSaveGameFormatVersion = 29;
inline constexpr FormatVersion MinSupportedSaveGameFormatVersion = 1; inline constexpr FormatVersion MinSupportedSaveGameFormatVersion = 2;
inline constexpr FormatVersion OpenMW0_48SaveGameFormatVersion = 21; inline constexpr FormatVersion OpenMW0_48SaveGameFormatVersion = 21;
inline constexpr FormatVersion OpenMW0_49SaveGameFormatVersion = CurrentSaveGameFormatVersion; inline constexpr FormatVersion OpenMW0_49SaveGameFormatVersion = CurrentSaveGameFormatVersion;
} }