Merge branch 'cleanup' into 'master'

Remove constant conditions

See merge request OpenMW/openmw!1527

1 files changed, 2 insertions, 5 deletions

diff --git a/components/esm/creaturestats.cpp b/components/esm/creaturestats.cpp
index ee4b0ad092..0f404ba58b 100644
--- a/components/esm/creaturestats.cpp
+++ b/components/esm/creaturestats.cpp
@@ -1,7 +1,6 @@
 #include "creaturestats.hpp"
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
-#include "savedgame.hpp"
 
 #include <limits>
 
@@ -183,9 +182,7 @@ void ESM::CreatureStats::save (ESMWriter &esm) const
     for (int i=0; i<3; ++i)
         mDynamic[i].save (esm);
 
-    if (ESM::SavedGame::sCurrentFormat <= 18 && mMissingACDT)
-        esm.writeHNT("GOLD", std::numeric_limits<int>::min());
-    else if(mGoldPool)
+    if (mGoldPool)
         esm.writeHNT("GOLD", mGoldPool);
 
     if (mTradeTime.mDay != 0 || mTradeTime.mHour != 0)
@@ -258,7 +255,7 @@ void ESM::CreatureStats::save (ESMWriter &esm) const
         for (int i=0; i<4; ++i)
             mAiSettings[i].save(esm);
     }
-    if(ESM::SavedGame::sCurrentFormat > 18 && mMissingACDT)
+    if (mMissingACDT)
         esm.writeHNT("NOAC", mMissingACDT);
 }