From 0e88fb3dca206ce61d938db7d70f96bfb26b1a2d Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sat, 14 Feb 2015 12:25:52 +0100
Subject: [PATCH] ESSImport: read AiPackages

---
 apps/essimporter/importcrec.cpp | 4 ++--
 apps/essimporter/importcrec.hpp | 2 ++
 apps/essimporter/importnpcc.cpp | 3 +--
 apps/essimporter/importnpcc.hpp | 1 +
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/apps/essimporter/importcrec.cpp b/apps/essimporter/importcrec.cpp
index 7a8a3eb00..64879f2af 100644
--- a/apps/essimporter/importcrec.cpp
+++ b/apps/essimporter/importcrec.cpp
@@ -14,10 +14,10 @@ namespace ESSImport
         float scale;
         esm.getHNOT(scale, "XSCL");
 
-        // FIXME: use AiPackageList, need to fix getSubName()
+
         while (esm.isNextSub("AI_W") || esm.isNextSub("AI_E") || esm.isNextSub("AI_T") || esm.isNextSub("AI_F")
                || esm.isNextSub("AI_A"))
-            esm.skipHSub();
+            mAiPackages.add(esm);
 
         mInventory.load(esm);
     }
diff --git a/apps/essimporter/importcrec.hpp b/apps/essimporter/importcrec.hpp
index 16b752807..5110fbc68 100644
--- a/apps/essimporter/importcrec.hpp
+++ b/apps/essimporter/importcrec.hpp
@@ -2,6 +2,7 @@
 #define OPENMW_ESSIMPORT_CREC_H
 
 #include "importinventory.hpp"
+#include <components/esm/aipackage.hpp>
 
 namespace ESM
 {
@@ -17,6 +18,7 @@ namespace ESSImport
         int mIndex;
 
         Inventory mInventory;
+        ESM::AIPackageList mAiPackages;
 
         void load(ESM::ESMReader& esm);
     };
diff --git a/apps/essimporter/importnpcc.cpp b/apps/essimporter/importnpcc.cpp
index 547b01441..3cbd749ce 100644
--- a/apps/essimporter/importnpcc.cpp
+++ b/apps/essimporter/importnpcc.cpp
@@ -9,10 +9,9 @@ namespace ESSImport
     {
         esm.getHNT(mNPDT, "NPDT");
 
-        // FIXME: use AiPackageList, need to fix getSubName()
         while (esm.isNextSub("AI_W") || esm.isNextSub("AI_E") || esm.isNextSub("AI_T") || esm.isNextSub("AI_F")
                || esm.isNextSub("AI_A"))
-            esm.skipHSub();
+            mAiPackages.add(esm);
 
         mInventory.load(esm);
     }
diff --git a/apps/essimporter/importnpcc.hpp b/apps/essimporter/importnpcc.hpp
index c69fa3e03..a23ab1e50 100644
--- a/apps/essimporter/importnpcc.hpp
+++ b/apps/essimporter/importnpcc.hpp
@@ -27,6 +27,7 @@ namespace ESSImport
         } mNPDT;
 
         Inventory mInventory;
+        ESM::AIPackageList mAiPackages;
 
         void load(ESM::ESMReader &esm);
     };