From 7376cb9b61f63a1f9f02c31227faeca96abcbd9f Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Tue, 3 Jun 2014 22:49:37 +0200
Subject: [PATCH] Fix loading ESX files cleaned with testool (Fixes #1382)

---
 components/esm/loadregn.cpp | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/components/esm/loadregn.cpp b/components/esm/loadregn.cpp
index da03e009f..0c3ccbffb 100644
--- a/components/esm/loadregn.cpp
+++ b/components/esm/loadregn.cpp
@@ -12,10 +12,26 @@ void Region::load(ESMReader &esm)
 {
     mName = esm.getHNOString("FNAM");
 
+    esm.getSubNameIs("WEAT");
+    esm.getSubHeader();
     if (esm.getVer() == VER_12)
-        esm.getHNExact(&mData, sizeof(mData) - 2, "WEAT");
+    {
+        mData.mA = 0;
+        mData.mB = 0;
+        esm.getExact(&mData, sizeof(mData) - 2);
+    }
     else if (esm.getVer() == VER_13)
-        esm.getHNExact(&mData, sizeof(mData), "WEAT");
+    {
+        // May include the additional two bytes (but not necessarily)
+        if (esm.getSubSize() == sizeof(mData))
+            esm.getExact(&mData, sizeof(mData));
+        else
+        {
+            mData.mA = 0;
+            mData.mB = 0;
+            esm.getExact(&mData, sizeof(mData)-2);
+        }
+    }
     else
         esm.fail("Don't know what to do in this version");