From e2fab228f9956fb68e850dfbbe6d579d174184d3 Mon Sep 17 00:00:00 2001
From: Jeffrey Haines <jeffhaines@me.com>
Date: Mon, 14 Apr 2014 18:11:04 -0400
Subject: [PATCH] Save state is handled correctly now.

---
 apps/openmw/mwmechanics/npcstats.cpp | 3 +++
 apps/openmw/mwworld/player.cpp       | 6 ++++++
 2 files changed, 9 insertions(+)

diff --git a/apps/openmw/mwmechanics/npcstats.cpp b/apps/openmw/mwmechanics/npcstats.cpp
index 4f014102d..e11e3b0c4 100644
--- a/apps/openmw/mwmechanics/npcstats.cpp
+++ b/apps/openmw/mwmechanics/npcstats.cpp
@@ -452,6 +452,8 @@ void MWMechanics::NpcStats::writeState (ESM::NpcStats& state) const
         mWerewolfSkill[i].writeState (state.mSkills[i].mWerewolf);
     }
 
+    state.mCrimeId = mCrimeId;
+
     state.mBounty = mBounty;
 
     for (std::set<std::string>::const_iterator iter (mExpelled.begin());
@@ -504,6 +506,7 @@ void MWMechanics::NpcStats::readState (const ESM::NpcStats& state)
         mWerewolfSkill[i].readState (state.mSkills[i].mWerewolf);
     }
 
+    mCrimeId = state.mCrimeId;
     mBounty = state.mBounty;
     mReputation = state.mReputation;
     mWerewolfKills = state.mWerewolfKills;
diff --git a/apps/openmw/mwworld/player.cpp b/apps/openmw/mwworld/player.cpp
index e8179b9f3..a4a4e9568 100644
--- a/apps/openmw/mwworld/player.cpp
+++ b/apps/openmw/mwworld/player.cpp
@@ -196,6 +196,9 @@ namespace MWWorld
         mPlayer.save (player.mObject);
         player.mCellId = mCellStore->getCell()->getCellId();
 
+        player.mCurrentCrimeId = mCurrentCrimeId;
+        player.mPayedCrimeId = mPayedCrimeId;
+
         player.mBirthsign = mSign;
 
         player.mLastKnownExteriorPosition[0] = mLastKnownExteriorPosition.x;
@@ -241,6 +244,9 @@ namespace MWWorld
                 !world.getStore().get<ESM::BirthSign>().search (player.mBirthsign))
                 throw std::runtime_error ("invalid player state record (birthsign)");
 
+            mCurrentCrimeId = player.mCurrentCrimeId;
+            mPayedCrimeId = player.mPayedCrimeId;
+
             mSign = player.mBirthsign;
 
             mLastKnownExteriorPosition.x = player.mLastKnownExteriorPosition[0];