From c241405d91bfa7dff7cd7149c7b81e1989b345be Mon Sep 17 00:00:00 2001
From: cc9cii <cc9c@iinet.net.au>
Date: Sat, 22 Feb 2014 12:15:20 +1100
Subject: [PATCH] Fix Windows save & load.

---
 apps/openmw/engine.cpp                  | 5 ++++-
 apps/openmw/mwstate/statemanagerimp.cpp | 2 +-
 components/esm/esmwriter.cpp            | 8 ++++----
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/apps/openmw/engine.cpp b/apps/openmw/engine.cpp
index e80bd954e..09757786b 100644
--- a/apps/openmw/engine.cpp
+++ b/apps/openmw/engine.cpp
@@ -2,6 +2,7 @@
 
 #include <stdexcept>
 
+#include <boost/filesystem.hpp>
 #include <OgreRoot.h>
 #include <OgreRenderWindow.h>
 
@@ -339,8 +340,10 @@ std::string OMW::Engine::loadSettings (Settings::Manager & settings)
 
 void OMW::Engine::prepareEngine (Settings::Manager & settings)
 {
+	boost::filesystem::path saves(mCfgMgr.getUserDataPath() / "saves");
+	
     mEnvironment.setStateManager (
-        new MWState::StateManager (mCfgMgr.getUserDataPath() / "saves", mContentFiles.at (0)));
+        new MWState::StateManager (saves.make_preferred(), mContentFiles.at (0)));
 
     Nif::NIFFile::CacheLock cachelock;
 
diff --git a/apps/openmw/mwstate/statemanagerimp.cpp b/apps/openmw/mwstate/statemanagerimp.cpp
index ba0e1d056..265069dc4 100644
--- a/apps/openmw/mwstate/statemanagerimp.cpp
+++ b/apps/openmw/mwstate/statemanagerimp.cpp
@@ -176,7 +176,7 @@ void MWState::StateManager::saveGame (const std::string& description, const Slot
     else
         slot = mCharacterManager.getCurrentCharacter()->updateSlot (slot, profile);
 
-    std::ofstream stream (slot->mPath.string().c_str());
+    std::ofstream stream (slot->mPath.string().c_str(), std::ios::binary);
 
     ESM::ESMWriter writer;
 
diff --git a/components/esm/esmwriter.cpp b/components/esm/esmwriter.cpp
index f38591b7b..91f123eb7 100644
--- a/components/esm/esmwriter.cpp
+++ b/components/esm/esmwriter.cpp
@@ -80,8 +80,8 @@ namespace ESM
         rec.name = name;
         rec.position = mStream->tellp();
         rec.size = 0;
-        writeT<int>(0); // Size goes here
-        writeT<int>(0); // Unused header?
+        writeT<uint32_t>(0); // Size goes here
+        writeT<uint32_t>(0); // Unused header?
         writeT(flags);
         mRecords.push_back(rec);
 
@@ -105,7 +105,7 @@ namespace ESM
         rec.name = name;
         rec.position = mStream->tellp();
         rec.size = 0;
-        writeT<int>(0); // Size goes here
+        writeT<uint32_t>(0); // Size goes here
         mRecords.push_back(rec);
 
         assert(mRecords.back().size == 0);
@@ -120,7 +120,7 @@ namespace ESM
         mStream->seekp(rec.position);
 
         mCounting = false;
-        write (reinterpret_cast<const char*> (&rec.size), sizeof(int));
+        write (reinterpret_cast<const char*> (&rec.size), sizeof(uint32_t));
         mCounting = true;
 
         mStream->seekp(0, std::ios::end);