From 40e07bbd2ae9cf57a55bf75086b8b2d997ae4d33 Mon Sep 17 00:00:00 2001
From: Nikolay Kasyanov <corrmage@gmail.com>
Date: Fri, 2 Mar 2012 19:50:04 +0400
Subject: [PATCH 1/7] Feature #161 (In Progress) Load REC_PGRD records Struct
 sizes seems correct, but floats is broken

---
 CMakeLists.txt                 |  7 ++++++
 components/esm/loadpgrd.cpp    | 45 ++++++++++++++++++++++++++++++++--
 components/esm/loadpgrd.hpp    | 23 ++++++++++++++++-
 components/esm_store/store.hpp |  4 +--
 4 files changed, 74 insertions(+), 5 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6fb0ee34c..3e116d875 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -255,6 +255,13 @@ if (APPLE)
         "${APP_BUNDLE_DIR}/Contents/Resources/OpenMW.icns" COPYONLY)
 
     # prepare plugins
+    if (${CMAKE_BUILD_TYPE} MATCHES "Release" OR
+        ${CMAKE_BUILD_TYPE} MATCHES "RelWithDebugInfo")
+        set(OGRE_PLUGIN_DIR ${OGRE_PLUGIN_DIR_REL})
+    else()
+        set(OGRE_PLUGIN_DIR ${OGRE_PLUGIN_DIR_DBG})
+    endif()
+
     foreach(plugin ${USED_OGRE_PLUGINS})
         configure_file("${OGRE_PLUGIN_DIR}/${plugin}.dylib"
                         "${APP_BUNDLE_DIR}/Contents/Plugins/${plugin}.dylib"
diff --git a/components/esm/loadpgrd.cpp b/components/esm/loadpgrd.cpp
index b0727b0c0..2242599b3 100644
--- a/components/esm/loadpgrd.cpp
+++ b/components/esm/loadpgrd.cpp
@@ -3,10 +3,22 @@
 namespace ESM
 {
 
+PathGrid::~PathGrid() {
+    if (points != NULL) {
+        delete[] points;
+        points = NULL;
+    }
+    if (edges != NULL) {
+        delete[] edges;
+        edges = NULL;
+    }
+}
+
 void PathGrid::load(ESMReader &esm)
 {
     esm.getHNT(data, "DATA", 12);
     cell = esm.getHNString("NAME");
+    std::cout << "loading PGRD for " << cell << std::endl;
 
     // Remember this file position
     context = esm.getContext();
@@ -14,10 +26,26 @@ void PathGrid::load(ESMReader &esm)
     // Check that the sizes match up. Size = 16 * s2 (path points?)
     if (esm.isNextSub("PGRP"))
     {
-        esm.skipHSub();
+        esm.getSubHeader();
         int size = esm.getSubSize();
+        std::cout << "PGRP size is " << size << std::endl;
         if (size != 16 * data.s2)
             esm.fail("Path grid table size mismatch");
+        else
+        {
+            pointCount = data.s2;
+            std::cout << "Path grid points count for cell `" << data.x
+                << " " << data.y << "` is " << data.s2 << std::endl;
+            points = new Point[pointCount];
+            esm.getExact(points, size);
+            for (int i = 0; i < pointCount; ++i)
+            {
+                std::cout << i << "'s point: " << points[i].x;
+                std::cout << " " << points[i].y;
+                std::cout << " " << points[i].z;
+                std::cout << std::endl;
+            }
+        }
     }
 
     // Size varies. Path grid chances? Connections? Multiples of 4
@@ -25,10 +53,23 @@ void PathGrid::load(ESMReader &esm)
     // it later.
     if (esm.isNextSub("PGRC"))
     {
-        esm.skipHSub();
+        esm.getSubHeader();
         int size = esm.getSubSize();
         if (size % 4 != 0)
             esm.fail("PGRC size not a multiple of 4");
+        else
+        {
+            edgeCount = size / sizeof(Edge);
+            std::cout << "Path grid edge count for cell " << data.x
+                << " " << data.y << " is " << size << std::endl;
+            edges = new Edge[edgeCount];
+            esm.getExact(edges, size);
+            for (int i = 0; i < edgeCount; ++i)
+            {
+                std::cout << i << "'s edge: " << edges[i].v0 << " "
+                << edges[i].v1 << std::endl;
+            }
+        }
     }
 }
 
diff --git a/components/esm/loadpgrd.hpp b/components/esm/loadpgrd.hpp
index 8c030d314..b8f97c661 100644
--- a/components/esm/loadpgrd.hpp
+++ b/components/esm/loadpgrd.hpp
@@ -19,12 +19,33 @@ struct PathGrid
         short s2; // Number of path points? Size of PGRP block is always 16 * s2;
     }; // 12 bytes
 
+#pragma pack(push, 1)
+    struct Point // path grid point
+    {
+        float x, y, z; // Location of point
+        int unknown; // Possibly flag for coloring/user-placed vs auto-generated
+    }; // 16 bytes
+
+    struct Edge // path grid edge
+    {
+        int v0, v1; // index of points connected with this edge
+    }; // 8 bytes
+#pragma pack(pop)
+
     std::string cell; // Cell name
     DATAstruct data;
+
+    Point *points;
+    int pointCount;
+    
+    Edge *edges;
+    int edgeCount;
+
     ESM_Context context; // Context so we can return here later and
                          // finish the job
-
     void load(ESMReader &esm);
+
+    ~PathGrid();
 };
 }
 #endif
diff --git a/components/esm_store/store.hpp b/components/esm_store/store.hpp
index e3bbf9e82..e5d173cb8 100644
--- a/components/esm_store/store.hpp
+++ b/components/esm_store/store.hpp
@@ -74,7 +74,7 @@ namespace ESMS
     ScriptListT<Script>         scripts;
     IndexListT<MagicEffect>     magicEffects;
     IndexListT<Skill>           skills;
-    //RecListT<PathGrid>    pathgrids;
+    RecListT<PathGrid>          pathgrids;
 
     // Special entry which is hardcoded and not loaded from an ESM
     IndexListT<Attribute>       attributes;
@@ -124,7 +124,7 @@ namespace ESMS
       recLists[REC_MISC] = &miscItems;
       recLists[REC_NPC_] = &npcs;
       recLists[REC_NPCC] = &npcChange;
-      //recLists[REC_PGRD] = &pathgrids;
+      recLists[REC_PGRD] = &pathgrids;
       recLists[REC_PROB] = &probes;
       recLists[REC_RACE] = &races;
       recLists[REC_REGN] = &regions;

From e58e00ef2aeb6c68bbd04880313dab6543a89d44 Mon Sep 17 00:00:00 2001
From: Nikolay Kasyanov <corrmage@gmail.com>
Date: Mon, 5 Mar 2012 00:04:36 +0400
Subject: [PATCH 2/7] Feature #161 (In Progress) Load REC_PGRD records Point
 coords definitely not floats

---
 components/esm/loadpgrd.cpp | 2 +-
 components/esm/loadpgrd.hpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/components/esm/loadpgrd.cpp b/components/esm/loadpgrd.cpp
index 2242599b3..7b76dd79f 100644
--- a/components/esm/loadpgrd.cpp
+++ b/components/esm/loadpgrd.cpp
@@ -61,7 +61,7 @@ void PathGrid::load(ESMReader &esm)
         {
             edgeCount = size / sizeof(Edge);
             std::cout << "Path grid edge count for cell " << data.x
-                << " " << data.y << " is " << size << std::endl;
+                << " " << data.y << " is " << edgeCount << std::endl;
             edges = new Edge[edgeCount];
             esm.getExact(edges, size);
             for (int i = 0; i < edgeCount; ++i)
diff --git a/components/esm/loadpgrd.hpp b/components/esm/loadpgrd.hpp
index b8f97c661..6c7de919c 100644
--- a/components/esm/loadpgrd.hpp
+++ b/components/esm/loadpgrd.hpp
@@ -22,7 +22,7 @@ struct PathGrid
 #pragma pack(push, 1)
     struct Point // path grid point
     {
-        float x, y, z; // Location of point
+        int x, y, z; // Location of point
         int unknown; // Possibly flag for coloring/user-placed vs auto-generated
     }; // 16 bytes
 

From 540e4f77a764a38e7b4645c366ee305d3dc8b441 Mon Sep 17 00:00:00 2001
From: Nikolay Kasyanov <corrmage@gmail.com>
Date: Tue, 6 Mar 2012 15:52:23 +0400
Subject: [PATCH 3/7] Feature #161 (In Progress) Load REC_PGRD records improved
 debug output

---
 components/esm/loadpgrd.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/components/esm/loadpgrd.cpp b/components/esm/loadpgrd.cpp
index 7b76dd79f..cd24f4caf 100644
--- a/components/esm/loadpgrd.cpp
+++ b/components/esm/loadpgrd.cpp
@@ -18,7 +18,7 @@ void PathGrid::load(ESMReader &esm)
 {
     esm.getHNT(data, "DATA", 12);
     cell = esm.getHNString("NAME");
-    std::cout << "loading PGRD for " << cell << std::endl;
+    std::cout << "loading PGRD for " << cell << " x=" << data.x << " y=" << data.y << std::endl;
 
     // Remember this file position
     context = esm.getContext();
@@ -34,8 +34,7 @@ void PathGrid::load(ESMReader &esm)
         else
         {
             pointCount = data.s2;
-            std::cout << "Path grid points count for cell `" << data.x
-                << " " << data.y << "` is " << data.s2 << std::endl;
+            std::cout << "Path grid points count is " << data.s2 << std::endl;
             points = new Point[pointCount];
             esm.getExact(points, size);
             for (int i = 0; i < pointCount; ++i)
@@ -55,13 +54,13 @@ void PathGrid::load(ESMReader &esm)
     {
         esm.getSubHeader();
         int size = esm.getSubSize();
+        std::cout << "PGRC size is " << size << std::endl;
         if (size % 4 != 0)
             esm.fail("PGRC size not a multiple of 4");
         else
         {
             edgeCount = size / sizeof(Edge);
-            std::cout << "Path grid edge count for cell " << data.x
-                << " " << data.y << " is " << edgeCount << std::endl;
+            std::cout << "Path grid edge count is " << edgeCount << std::endl;
             edges = new Edge[edgeCount];
             esm.getExact(edges, size);
             for (int i = 0; i < edgeCount; ++i)
@@ -71,6 +70,7 @@ void PathGrid::load(ESMReader &esm)
             }
         }
     }
+    std::cin.ignore(1);
 }
 
 }

From 08db70e1370d9dbc2574f9dc467d2ae8c6ae624f Mon Sep 17 00:00:00 2001
From: Nikolay Kasyanov <corrmage@gmail.com>
Date: Thu, 8 Mar 2012 01:00:13 +0400
Subject: [PATCH 4/7] disabled debug output

---
 components/esm/loadpgrd.cpp | 35 +++++++++++++++++------------------
 1 file changed, 17 insertions(+), 18 deletions(-)

diff --git a/components/esm/loadpgrd.cpp b/components/esm/loadpgrd.cpp
index cd24f4caf..6787fab6e 100644
--- a/components/esm/loadpgrd.cpp
+++ b/components/esm/loadpgrd.cpp
@@ -18,7 +18,7 @@ void PathGrid::load(ESMReader &esm)
 {
     esm.getHNT(data, "DATA", 12);
     cell = esm.getHNString("NAME");
-    std::cout << "loading PGRD for " << cell << " x=" << data.x << " y=" << data.y << std::endl;
+    //std::cout << "loading PGRD for " << cell << " x=" << data.x << " y=" << data.y << std::endl;
 
     // Remember this file position
     context = esm.getContext();
@@ -28,22 +28,22 @@ void PathGrid::load(ESMReader &esm)
     {
         esm.getSubHeader();
         int size = esm.getSubSize();
-        std::cout << "PGRP size is " << size << std::endl;
+        //std::cout << "PGRP size is " << size << std::endl;
         if (size != 16 * data.s2)
             esm.fail("Path grid table size mismatch");
         else
         {
             pointCount = data.s2;
-            std::cout << "Path grid points count is " << data.s2 << std::endl;
+            //std::cout << "Path grid points count is " << data.s2 << std::endl;
             points = new Point[pointCount];
             esm.getExact(points, size);
-            for (int i = 0; i < pointCount; ++i)
-            {
-                std::cout << i << "'s point: " << points[i].x;
-                std::cout << " " << points[i].y;
-                std::cout << " " << points[i].z;
-                std::cout << std::endl;
-            }
+//            for (int i = 0; i < pointCount; ++i)
+//            {
+//                std::cout << i << "'s point: " << points[i].x;
+//                std::cout << " " << points[i].y;
+//                std::cout << " " << points[i].z;
+//                std::cout << std::endl;
+//            }
         }
     }
 
@@ -54,23 +54,22 @@ void PathGrid::load(ESMReader &esm)
     {
         esm.getSubHeader();
         int size = esm.getSubSize();
-        std::cout << "PGRC size is " << size << std::endl;
+        //std::cout << "PGRC size is " << size << std::endl;
         if (size % 4 != 0)
             esm.fail("PGRC size not a multiple of 4");
         else
         {
             edgeCount = size / sizeof(Edge);
-            std::cout << "Path grid edge count is " << edgeCount << std::endl;
+            //std::cout << "Path grid edge count is " << edgeCount << std::endl;
             edges = new Edge[edgeCount];
             esm.getExact(edges, size);
-            for (int i = 0; i < edgeCount; ++i)
-            {
-                std::cout << i << "'s edge: " << edges[i].v0 << " "
-                << edges[i].v1 << std::endl;
-            }
+//            for (int i = 0; i < edgeCount; ++i)
+//            {
+//                std::cout << i << "'s edge: " << edges[i].v0 << " "
+//                << edges[i].v1 << std::endl;
+//            }
         }
     }
-    std::cin.ignore(1);
 }
 
 }

From fda5b59eb64b49951c82dda990598dcd0e2e4c21 Mon Sep 17 00:00:00 2001
From: Nikolay Kasyanov <corrmage@gmail.com>
Date: Fri, 9 Mar 2012 23:35:20 +0400
Subject: [PATCH 5/7] Feature #161 (In Progress) Load REC_PGRD records now
 using vector instead of C arrays fixed path grid edge loading added path grid
 to cell store implemented dedicated storage class for path grids

---
 components/esm/loadpgrd.cpp         | 54 ++++++++++++---------
 components/esm/loadpgrd.hpp         | 14 ++----
 components/esm_store/cell_store.hpp |  4 ++
 components/esm_store/reclists.hpp   | 74 +++++++++++++++++++++++++++++
 components/esm_store/store.hpp      |  3 +-
 5 files changed, 115 insertions(+), 34 deletions(-)

diff --git a/components/esm/loadpgrd.cpp b/components/esm/loadpgrd.cpp
index 6787fab6e..39684c080 100644
--- a/components/esm/loadpgrd.cpp
+++ b/components/esm/loadpgrd.cpp
@@ -3,25 +3,14 @@
 namespace ESM
 {
 
-PathGrid::~PathGrid() {
-    if (points != NULL) {
-        delete[] points;
-        points = NULL;
-    }
-    if (edges != NULL) {
-        delete[] edges;
-        edges = NULL;
-    }
-}
-
-void PathGrid::load(ESMReader &esm)
+void Pathgrid::load(ESMReader &esm)
 {
     esm.getHNT(data, "DATA", 12);
     cell = esm.getHNString("NAME");
-    //std::cout << "loading PGRD for " << cell << " x=" << data.x << " y=" << data.y << std::endl;
-
-    // Remember this file position
-    context = esm.getContext();
+//    std::cout << "loading PGRD for " <<
+//                 cell << " x=" << data.x << " y=" << data.y <<
+//                 " " << data.s1
+//                 << std::endl;
 
     // Check that the sizes match up. Size = 16 * s2 (path points?)
     if (esm.isNextSub("PGRP"))
@@ -35,8 +24,13 @@ void PathGrid::load(ESMReader &esm)
         {
             pointCount = data.s2;
             //std::cout << "Path grid points count is " << data.s2 << std::endl;
-            points = new Point[pointCount];
-            esm.getExact(points, size);
+            points.reserve(pointCount);
+            for (int i = 0; i < pointCount; ++i)
+            {
+                Point p;
+                esm.getExact(&p, sizeof(Point));
+                points.push_back(p);
+            }
 //            for (int i = 0; i < pointCount; ++i)
 //            {
 //                std::cout << i << "'s point: " << points[i].x;
@@ -53,16 +47,30 @@ void PathGrid::load(ESMReader &esm)
     if (esm.isNextSub("PGRC"))
     {
         esm.getSubHeader();
+        //esm.skipHSub();
         int size = esm.getSubSize();
         //std::cout << "PGRC size is " << size << std::endl;
-        if (size % 4 != 0)
-            esm.fail("PGRC size not a multiple of 4");
+        if (size % sizeof(int) != 0)
+            esm.fail("PGRC size not a multiple of 8");
         else
         {
-            edgeCount = size / sizeof(Edge);
+            edgeCount = size / sizeof(int) - 1;
             //std::cout << "Path grid edge count is " << edgeCount << std::endl;
-            edges = new Edge[edgeCount];
-            esm.getExact(edges, size);
+            edges.reserve(edgeCount);
+            int prevValue;
+            esm.getT(prevValue);
+            //esm.getExact(&prevValue, sizeof(int));
+            for (int i = 0; i < edgeCount; ++i)
+            {
+                int nextValue;
+                esm.getT(nextValue);
+                //esm.getExact(&nextValue, sizeof(int));
+                Edge e;
+                e.v0 = prevValue;
+                e.v1 = nextValue;
+                edges.push_back(e);
+                prevValue = nextValue;
+            }
 //            for (int i = 0; i < edgeCount; ++i)
 //            {
 //                std::cout << i << "'s edge: " << edges[i].v0 << " "
diff --git a/components/esm/loadpgrd.hpp b/components/esm/loadpgrd.hpp
index 6c7de919c..da9fe33e3 100644
--- a/components/esm/loadpgrd.hpp
+++ b/components/esm/loadpgrd.hpp
@@ -9,7 +9,7 @@ namespace ESM
 /*
  * Path grid.
  */
-struct PathGrid
+struct Pathgrid
 {
     struct DATAstruct
     {
@@ -19,7 +19,6 @@ struct PathGrid
         short s2; // Number of path points? Size of PGRP block is always 16 * s2;
     }; // 12 bytes
 
-#pragma pack(push, 1)
     struct Point // path grid point
     {
         int x, y, z; // Location of point
@@ -30,22 +29,17 @@ struct PathGrid
     {
         int v0, v1; // index of points connected with this edge
     }; // 8 bytes
-#pragma pack(pop)
 
     std::string cell; // Cell name
     DATAstruct data;
 
-    Point *points;
+    std::vector<Point> points;
     int pointCount;
-    
-    Edge *edges;
+
+    std::vector<Edge> edges;
     int edgeCount;
 
-    ESM_Context context; // Context so we can return here later and
-                         // finish the job
     void load(ESMReader &esm);
-
-    ~PathGrid();
 };
 }
 #endif
diff --git a/components/esm_store/cell_store.hpp b/components/esm_store/cell_store.hpp
index c4bcf84d8..eae2bb782 100644
--- a/components/esm_store/cell_store.hpp
+++ b/components/esm_store/cell_store.hpp
@@ -123,6 +123,8 @@ namespace ESMS
     CellRefList<Static, D>            statics;
     CellRefList<Weapon, D>            weapons;
 
+    ESM::Pathgrid *pathgrid;
+
     void load (const ESMStore &store, ESMReader &esm)
     {
         if (mState!=State_Loaded)
@@ -134,6 +136,8 @@ namespace ESMS
 
             loadRefs (store, esm);
 
+            pathgrid = store.pathgrids.search(cell->data.gridX, cell->data.gridY, cell->name);
+
             mState = State_Loaded;
         }
     }
diff --git a/components/esm_store/reclists.hpp b/components/esm_store/reclists.hpp
index 20a2e8ff9..91357286d 100644
--- a/components/esm_store/reclists.hpp
+++ b/components/esm_store/reclists.hpp
@@ -390,6 +390,80 @@ namespace ESMS
     }
   };
 
+  struct PathgridList : RecList
+  {
+      int count;
+
+      // List of grids for interior cells. Indexed by cell name.
+      typedef std::map<std::string,ESM::Pathgrid*, ciLessBoost> IntGrids;
+      IntGrids intGrids;
+
+      // List of grids for exterior cells. Indexed as extCells[gridX][gridY].
+      typedef std::map<std::pair<int, int>, ESM::Pathgrid*> ExtGrids;
+      ExtGrids extGrids;
+
+      PathgridList() : count(0) {}
+
+      ~PathgridList()
+      {
+          for (IntGrids::iterator it = intGrids.begin(); it!=intGrids.end(); ++it)
+              delete it->second;
+
+          for (ExtGrids::iterator it = extGrids.begin(); it!=extGrids.end(); ++it)
+              delete it->second;
+      }
+
+      int getSize() { return count; }
+
+      virtual void listIdentifier (std::vector<std::string>& identifier) const
+      {
+          // do nothing
+      }
+
+      void load(ESMReader &esm, const std::string &id)
+      {
+          count++;
+          ESM::Pathgrid *grid = new ESM::Pathgrid;
+          grid->load(esm);
+          if (grid->data.x == 0 && grid->data.y)
+          {
+              intGrids[grid->cell] = grid;
+          }
+          else
+          {
+              extGrids[std::make_pair(grid->data.x, grid->data.y)] = grid;
+          }
+      }
+
+      Pathgrid *find(int cellX, int cellY, std::string cellName) const
+      {
+          Pathgrid *result = search(cellX, cellY, cellName);
+          if (!result)
+          {
+              throw std::runtime_error("no pathgrid found for cell " + cellName);
+          }
+          return result;
+      }
+
+      Pathgrid *search(int cellX, int cellY, std::string cellName) const
+      {
+          Pathgrid *result = NULL;
+          if (cellX == 0 && cellY == 0) // possibly interior
+          {
+              IntGrids::const_iterator it = intGrids.find(cellName);
+              if (it != intGrids.end())
+                result = it->second;
+          }
+          else
+          {
+              ExtGrids::const_iterator it = extGrids.find(std::make_pair(cellX, cellY));
+              if (it != extGrids.end())
+                result = it->second;
+          }
+          return result;
+      }
+  };
+
   template <typename X>
   struct ScriptListT : RecList
   {
diff --git a/components/esm_store/store.hpp b/components/esm_store/store.hpp
index e5d173cb8..fab04d3e9 100644
--- a/components/esm_store/store.hpp
+++ b/components/esm_store/store.hpp
@@ -74,7 +74,8 @@ namespace ESMS
     ScriptListT<Script>         scripts;
     IndexListT<MagicEffect>     magicEffects;
     IndexListT<Skill>           skills;
-    RecListT<PathGrid>          pathgrids;
+    //RecListT<Pathgrid>          pathgrids;
+    PathgridList                pathgrids;
 
     // Special entry which is hardcoded and not loaded from an ESM
     IndexListT<Attribute>       attributes;

From de5b692f9f88c84825aabcfc882f974a63b749f0 Mon Sep 17 00:00:00 2001
From: Nikolay Kasyanov <corrmage@gmail.com>
Date: Sat, 10 Mar 2012 13:37:35 +0400
Subject: [PATCH 6/7] Feature #161 (Resolved) Load REC_PGRD records

---
 components/esm/loadpgrd.cpp         | 14 ++++----------
 components/esm/loadpgrd.hpp         | 10 +++++-----
 components/esm_store/cell_store.hpp |  4 ----
 components/esm_store/reclists.hpp   | 17 ++++++++++++++++-
 4 files changed, 25 insertions(+), 20 deletions(-)

diff --git a/components/esm/loadpgrd.cpp b/components/esm/loadpgrd.cpp
index 39684c080..f04914f97 100644
--- a/components/esm/loadpgrd.cpp
+++ b/components/esm/loadpgrd.cpp
@@ -12,17 +12,17 @@ void Pathgrid::load(ESMReader &esm)
 //                 " " << data.s1
 //                 << std::endl;
 
-    // Check that the sizes match up. Size = 16 * s2 (path points?)
+    // Check that the sizes match up. Size = 16 * s2 (path points)
     if (esm.isNextSub("PGRP"))
     {
         esm.getSubHeader();
         int size = esm.getSubSize();
         //std::cout << "PGRP size is " << size << std::endl;
-        if (size != 16 * data.s2)
+        if (size != sizeof(Point) * data.s2)
             esm.fail("Path grid table size mismatch");
         else
         {
-            pointCount = data.s2;
+            int pointCount = data.s2;
             //std::cout << "Path grid points count is " << data.s2 << std::endl;
             points.reserve(pointCount);
             for (int i = 0; i < pointCount; ++i)
@@ -41,30 +41,24 @@ void Pathgrid::load(ESMReader &esm)
         }
     }
 
-    // Size varies. Path grid chances? Connections? Multiples of 4
-    // suggest either int or two shorts, or perhaps a float. Study
-    // it later.
     if (esm.isNextSub("PGRC"))
     {
         esm.getSubHeader();
-        //esm.skipHSub();
         int size = esm.getSubSize();
         //std::cout << "PGRC size is " << size << std::endl;
         if (size % sizeof(int) != 0)
             esm.fail("PGRC size not a multiple of 8");
         else
         {
-            edgeCount = size / sizeof(int) - 1;
+            int edgeCount = size / sizeof(int) - 1;
             //std::cout << "Path grid edge count is " << edgeCount << std::endl;
             edges.reserve(edgeCount);
             int prevValue;
             esm.getT(prevValue);
-            //esm.getExact(&prevValue, sizeof(int));
             for (int i = 0; i < edgeCount; ++i)
             {
                 int nextValue;
                 esm.getT(nextValue);
-                //esm.getExact(&nextValue, sizeof(int));
                 Edge e;
                 e.v0 = prevValue;
                 e.v1 = nextValue;
diff --git a/components/esm/loadpgrd.hpp b/components/esm/loadpgrd.hpp
index da9fe33e3..6b01c906a 100644
--- a/components/esm/loadpgrd.hpp
+++ b/components/esm/loadpgrd.hpp
@@ -16,7 +16,7 @@ struct Pathgrid
         int x, y; // Grid location, matches cell for exterior cells
         short s1; // ?? Usually but not always a power of 2. Doesn't seem
                   // to have any relation to the size of PGRC.
-        short s2; // Number of path points? Size of PGRP block is always 16 * s2;
+        short s2; // Number of path points.
     }; // 12 bytes
 
     struct Point // path grid point
@@ -33,11 +33,11 @@ struct Pathgrid
     std::string cell; // Cell name
     DATAstruct data;
 
-    std::vector<Point> points;
-    int pointCount;
+    typedef std::vector<Point> PointList;
+    PointList points;
 
-    std::vector<Edge> edges;
-    int edgeCount;
+    typedef std::vector<Edge> EdgeList;
+    EdgeList edges;
 
     void load(ESMReader &esm);
 };
diff --git a/components/esm_store/cell_store.hpp b/components/esm_store/cell_store.hpp
index eae2bb782..c4bcf84d8 100644
--- a/components/esm_store/cell_store.hpp
+++ b/components/esm_store/cell_store.hpp
@@ -123,8 +123,6 @@ namespace ESMS
     CellRefList<Static, D>            statics;
     CellRefList<Weapon, D>            weapons;
 
-    ESM::Pathgrid *pathgrid;
-
     void load (const ESMStore &store, ESMReader &esm)
     {
         if (mState!=State_Loaded)
@@ -136,8 +134,6 @@ namespace ESMS
 
             loadRefs (store, esm);
 
-            pathgrid = store.pathgrids.search(cell->data.gridX, cell->data.gridY, cell->name);
-
             mState = State_Loaded;
         }
     }
diff --git a/components/esm_store/reclists.hpp b/components/esm_store/reclists.hpp
index 91357286d..4aacf2332 100644
--- a/components/esm_store/reclists.hpp
+++ b/components/esm_store/reclists.hpp
@@ -425,7 +425,7 @@ namespace ESMS
           count++;
           ESM::Pathgrid *grid = new ESM::Pathgrid;
           grid->load(esm);
-          if (grid->data.x == 0 && grid->data.y)
+          if (grid->data.x == 0 && grid->data.y == 0)
           {
               intGrids[grid->cell] = grid;
           }
@@ -462,6 +462,21 @@ namespace ESMS
           }
           return result;
       }
+
+      Pathgrid *search(const ESM::Cell &cell) const
+      {
+          int cellX, cellY;
+          if (cell.data.flags & ESM::Cell::Interior)
+          {
+              cellX = cellY = 0;
+          }
+          else
+          {
+              cellX = cell.data.gridX;
+              cellY = cell.data.gridY;
+          }
+          return search(cellX, cellY, cell.name);
+      }
   };
 
   template <typename X>

From 988c1111e9e42aee9b90876021c09580ac709773 Mon Sep 17 00:00:00 2001
From: Nikolay Kasyanov <corrmage@gmail.com>
Date: Wed, 14 Mar 2012 12:45:42 +0400
Subject: [PATCH 7/7] Feature #161 (Fix) Load REC_PGRD records fixed edge
 decoding, thanks Project Aedra!

---
 components/esm/loadpgrd.cpp | 62 +++++++++++++++++--------------------
 components/esm/loadpgrd.hpp |  4 ++-
 2 files changed, 31 insertions(+), 35 deletions(-)

diff --git a/components/esm/loadpgrd.cpp b/components/esm/loadpgrd.cpp
index f04914f97..0d7d934ca 100644
--- a/components/esm/loadpgrd.cpp
+++ b/components/esm/loadpgrd.cpp
@@ -7,37 +7,28 @@ void Pathgrid::load(ESMReader &esm)
 {
     esm.getHNT(data, "DATA", 12);
     cell = esm.getHNString("NAME");
-//    std::cout << "loading PGRD for " <<
-//                 cell << " x=" << data.x << " y=" << data.y <<
-//                 " " << data.s1
-//                 << std::endl;
 
-    // Check that the sizes match up. Size = 16 * s2 (path points)
+    // keep track of total connections so we can reserve edge vector size
+    int edgeCount = 0;
+
     if (esm.isNextSub("PGRP"))
     {
         esm.getSubHeader();
         int size = esm.getSubSize();
-        //std::cout << "PGRP size is " << size << std::endl;
+        // Check that the sizes match up. Size = 16 * s2 (path points)
         if (size != sizeof(Point) * data.s2)
-            esm.fail("Path grid table size mismatch");
+            esm.fail("Path point subrecord size mismatch");
         else
         {
             int pointCount = data.s2;
-            //std::cout << "Path grid points count is " << data.s2 << std::endl;
             points.reserve(pointCount);
             for (int i = 0; i < pointCount; ++i)
             {
                 Point p;
                 esm.getExact(&p, sizeof(Point));
                 points.push_back(p);
+                edgeCount += p.connectionNum;
             }
-//            for (int i = 0; i < pointCount; ++i)
-//            {
-//                std::cout << i << "'s point: " << points[i].x;
-//                std::cout << " " << points[i].y;
-//                std::cout << " " << points[i].z;
-//                std::cout << std::endl;
-//            }
         }
     }
 
@@ -45,31 +36,34 @@ void Pathgrid::load(ESMReader &esm)
     {
         esm.getSubHeader();
         int size = esm.getSubSize();
-        //std::cout << "PGRC size is " << size << std::endl;
         if (size % sizeof(int) != 0)
-            esm.fail("PGRC size not a multiple of 8");
+            esm.fail("PGRC size not a multiple of 4");
         else
         {
-            int edgeCount = size / sizeof(int) - 1;
-            //std::cout << "Path grid edge count is " << edgeCount << std::endl;
+            int rawConnNum = size / sizeof(int);
+            std::vector<int> rawConnections;
+            rawConnections.reserve(rawConnNum);
+            for (int i = 0; i < rawConnNum; ++i)
+            {
+                int currentValue;
+                esm.getT(currentValue);
+                rawConnections.push_back(currentValue);
+            }
+
+            std::vector<int>::const_iterator rawIt = rawConnections.begin();
+            int pointIndex = 0;
             edges.reserve(edgeCount);
-            int prevValue;
-            esm.getT(prevValue);
-            for (int i = 0; i < edgeCount; ++i)
+            for(PointList::const_iterator it = points.begin(); it != points.end(); it++, pointIndex++)
             {
-                int nextValue;
-                esm.getT(nextValue);
-                Edge e;
-                e.v0 = prevValue;
-                e.v1 = nextValue;
-                edges.push_back(e);
-                prevValue = nextValue;
+                unsigned char connectionNum = (*it).connectionNum;
+                for (int i = 0; i < connectionNum; ++i) {
+                    Edge edge;
+                    edge.v0 = pointIndex;
+                    edge.v1 = *rawIt;
+                    rawIt++;
+                    edges.push_back(edge);
+                }
             }
-//            for (int i = 0; i < edgeCount; ++i)
-//            {
-//                std::cout << i << "'s edge: " << edges[i].v0 << " "
-//                << edges[i].v1 << std::endl;
-//            }
         }
     }
 }
diff --git a/components/esm/loadpgrd.hpp b/components/esm/loadpgrd.hpp
index 6b01c906a..6e2c6e134 100644
--- a/components/esm/loadpgrd.hpp
+++ b/components/esm/loadpgrd.hpp
@@ -22,7 +22,9 @@ struct Pathgrid
     struct Point // path grid point
     {
         int x, y, z; // Location of point
-        int unknown; // Possibly flag for coloring/user-placed vs auto-generated
+        unsigned char autogenerated; // autogenerated vs. user coloring flag?
+        unsigned char connectionNum; // number of connections for this point
+        short unknown;
     }; // 16 bytes
 
     struct Edge // path grid edge