From a081d402c571c88ea69d8e6044a862f781fbf3f3 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Tue, 30 Jun 2015 17:26:33 +0200
Subject: [PATCH] Use the format field instead of version field

---
 apps/openmw/mwstate/statemanagerimp.cpp | 5 ++---
 components/esm/objectstate.cpp          | 2 +-
 components/esm/savedgame.cpp            | 1 +
 components/esm/savedgame.hpp            | 2 ++
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/apps/openmw/mwstate/statemanagerimp.cpp b/apps/openmw/mwstate/statemanagerimp.cpp
index 313279063..2c0540fbc 100644
--- a/apps/openmw/mwstate/statemanagerimp.cpp
+++ b/apps/openmw/mwstate/statemanagerimp.cpp
@@ -216,11 +216,10 @@ void MWState::StateManager::saveGame (const std::string& description, const Slot
             ++iter)
             writer.addMaster (*iter, 0); // not using the size information anyway -> use value of 0
 
-        writer.setFormat (ESM::Header::CurrentFormat);
-
-        writer.setVersion(1);
+        writer.setFormat (ESM::SavedGame::sCurrentFormat);
 
         // all unused
+        writer.setVersion(0);
         writer.setType(0);
         writer.setAuthor("");
         writer.setDescription("");
diff --git a/components/esm/objectstate.cpp b/components/esm/objectstate.cpp
index 8d73b10c6..0ae690ee8 100644
--- a/components/esm/objectstate.cpp
+++ b/components/esm/objectstate.cpp
@@ -6,7 +6,7 @@
 
 void ESM::ObjectState::load (ESMReader &esm)
 {
-    mVersion = esm.getVer();
+    mVersion = esm.getFormat();
 
     mRef.loadData(esm);
 
diff --git a/components/esm/savedgame.cpp b/components/esm/savedgame.cpp
index b5e0810db..9cdb28766 100644
--- a/components/esm/savedgame.cpp
+++ b/components/esm/savedgame.cpp
@@ -6,6 +6,7 @@
 #include "defs.hpp"
 
 unsigned int ESM::SavedGame::sRecordId = ESM::REC_SAVE;
+int ESM::SavedGame::sCurrentFormat = 1;
 
 void ESM::SavedGame::load (ESMReader &esm)
 {
diff --git a/components/esm/savedgame.hpp b/components/esm/savedgame.hpp
index 3e7cae775..aa0429657 100644
--- a/components/esm/savedgame.hpp
+++ b/components/esm/savedgame.hpp
@@ -15,6 +15,8 @@ namespace ESM
     {
         static unsigned int sRecordId;
 
+        static int sCurrentFormat;
+
         struct TimeStamp
         {
             float mGameHour;