From 51020fdb5fb2a95ec9339a331e68d04bc831f858 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Wed, 14 May 2014 09:17:30 +0200
Subject: [PATCH] Fix a bug for NpcStats::mUsedIds in savegames, and added a
 compile-time guard to prevent similar errors in the future.

---
 components/esm/esmwriter.hpp | 12 ++++++++++++
 components/esm/npcstats.cpp  |  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/components/esm/esmwriter.hpp b/components/esm/esmwriter.hpp
index 57faefdf4..ca4f42217 100644
--- a/components/esm/esmwriter.hpp
+++ b/components/esm/esmwriter.hpp
@@ -74,6 +74,18 @@ class ESMWriter
             endRecord(name);
         }
 
+private:
+        // Prevent using writeHNT with strings. This already happened by accident and results in
+        // state being discarded without any error on writing or reading it. :(
+        // writeHNString and friends must be used instead.
+        void writeHNT(const std::string &name, std::string data)
+        {
+        }
+        void writeT(const std::string& data)
+        {
+        }
+public:
+
         template<typename T>
         void writeHNT(const std::string& name, const T& data, int size)
         {
diff --git a/components/esm/npcstats.cpp b/components/esm/npcstats.cpp
index 21f573bc7..3fa954182 100644
--- a/components/esm/npcstats.cpp
+++ b/components/esm/npcstats.cpp
@@ -140,7 +140,7 @@ void ESM::NpcStats::save (ESMWriter &esm) const
 
     for (std::vector<std::string>::const_iterator iter (mUsedIds.begin()); iter!=mUsedIds.end();
         ++iter)
-        esm.writeHNT ("USED", *iter);
+        esm.writeHNString ("USED", *iter);
 
     if (mTimeToStartDrowning)
         esm.writeHNT ("DRTI", mTimeToStartDrowning);