From 4c3c67422313ba747808eff5a6c3bc2882671c98 Mon Sep 17 00:00:00 2001
From: cc9cii <cc9c@iinet.net.au>
Date: Tue, 9 Dec 2014 19:37:37 +1100
Subject: [PATCH] Resolve merge issues.

---
 apps/opencs/view/render/pathgridpoint.cpp | 2 +-
 apps/opencs/view/render/pathgridpoint.hpp | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/apps/opencs/view/render/pathgridpoint.cpp b/apps/opencs/view/render/pathgridpoint.cpp
index 3e365932f9..85b03beea9 100644
--- a/apps/opencs/view/render/pathgridpoint.cpp
+++ b/apps/opencs/view/render/pathgridpoint.cpp
@@ -15,7 +15,7 @@
 namespace CSVRender
 {
     PathgridPoint::PathgridPoint(const std::string &name,
-            Ogre::SceneNode *cellNode, const Ogre::Vector3 &pos, CSVWorld::PhysicsSystem *physics)
+            Ogre::SceneNode *cellNode, const Ogre::Vector3 &pos, boost::shared_ptr<CSVWorld::PhysicsSystem> physics)
         : mBase(cellNode), mPhysics(physics)
     {
         mBase = cellNode->createChildSceneNode();
diff --git a/apps/opencs/view/render/pathgridpoint.hpp b/apps/opencs/view/render/pathgridpoint.hpp
index 3419082c3a..54fe70e311 100644
--- a/apps/opencs/view/render/pathgridpoint.hpp
+++ b/apps/opencs/view/render/pathgridpoint.hpp
@@ -1,6 +1,8 @@
 #ifndef OPENCS_VIEW_PATHGRIDPOINT_H
 #define OPENCS_VIEW_PATHGRIDPOINT_H
 
+#include <boost/shared_ptr.hpp>
+
 #include <components/nifogre/ogrenifloader.hpp>
 
 namespace Ogre
@@ -19,14 +21,15 @@ namespace CSVRender
 {
     class PathgridPoint
     {
-            CSVWorld::PhysicsSystem *mPhysics; // local copy
+            boost::shared_ptr<CSVWorld::PhysicsSystem> mPhysics; // local copy
             NifOgre::ObjectScenePtr mPgPoint;
             Ogre::SceneNode *mBase;
 
         public:
 
             PathgridPoint(const std::string &name,
-                Ogre::SceneNode *cellNode, const Ogre::Vector3 &pos, CSVWorld::PhysicsSystem *physics);
+                Ogre::SceneNode *cellNode, const Ogre::Vector3 &pos,
+                boost::shared_ptr<CSVWorld::PhysicsSystem> physics);
 
             ~PathgridPoint();