From 9b6faa2ffaa79777b54297a52ace4bcb03967d15 Mon Sep 17 00:00:00 2001
From: Marco Melletti <melletti.marco@gmail.com>
Date: Sat, 6 Sep 2014 17:04:50 +0200
Subject: [PATCH] wrong rearrangement fixes misleading comments fixed

---
 components/esm/aipackage.hpp | 6 ++++--
 components/esm/loadarmo.hpp  | 2 +-
 components/esm/loadnpc.hpp   | 9 ++++-----
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/components/esm/aipackage.hpp b/components/esm/aipackage.hpp
index 2e054c3e7..cbe82f16e 100644
--- a/components/esm/aipackage.hpp
+++ b/components/esm/aipackage.hpp
@@ -16,8 +16,10 @@ namespace ESM
 
     struct AIData
     {
-        char mU1, mU2, mU3, mU4; // Unknown values
-        unsigned char mHello, mFight, mFlee, mAlarm; // These are probabilities [0, 100]
+        unsigned char mHello;
+        char mU1;
+        unsigned char mFight, mFlee, mAlarm; // These are probabilities [0, 100]
+        char mU2, mU3, mU4; // Unknown values
         int mServices; // See the Services enum
 
         void blank();
diff --git a/components/esm/loadarmo.hpp b/components/esm/loadarmo.hpp
index 41fbcf818..6be9dd971 100644
--- a/components/esm/loadarmo.hpp
+++ b/components/esm/loadarmo.hpp
@@ -46,7 +46,7 @@ enum PartReferenceType
 // Reference to body parts
 struct PartReference
 {
-    unsigned char mPart; // declared values [0, 26]
+    unsigned char mPart; // possible values [0, 26]
     std::string mMale, mFemale;
 };
 
diff --git a/components/esm/loadnpc.hpp b/components/esm/loadnpc.hpp
index 5ea9c995d..0e90108c3 100644
--- a/components/esm/loadnpc.hpp
+++ b/components/esm/loadnpc.hpp
@@ -80,14 +80,13 @@ struct NPC
              mPersonality,
              mLuck;
 
-        // mSkill cang grow up to 200, it must be unsigned
+        // mSkill can grow up to 200, it must be unsigned
         unsigned char mSkills[Skill::Length];
 
-        // reputation values does not
-        char mUnknown1;
+        char mFactionID;
         unsigned short mHealth, mMana, mFatigue;
         signed char mDisposition, mReputation, mRank;
-        char mUnknown2;
+        char mUnknown;
         int mGold;
     }; // 52 bytes
 
@@ -95,7 +94,7 @@ struct NPC
     {
         short mLevel;
         // see above
-        signed char mReputation, mDisposition, mRank;
+        signed char mDisposition, mReputation, mRank;
         char mUnknown1, mUnknown2, mUnknown3;
         int mGold;
     }; // 12 bytes