mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-18 13:12:50 +00:00
Code Issues Projects Releases Wiki Activity

Fix a bug for NpcStats::mUsedIds in savegames, and added a compile-time guard to prevent similar errors in the future.

Browse Source
This commit is contained in:
scrawl 2014-05-14 09:17:30 +02:00
parent dfacf8c044
commit 51020fdb5f
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
components/esm/esmwriter.hpp
View File

@ -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)
{

2
components/esm/npcstats.cpp
View File

@ -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);