From 62d8d1add22a70b2e8e8adb69e63e98b66a1dd89 Mon Sep 17 00:00:00 2001
From: Jason Hooks <Hooks@.(none)>
Date: Fri, 11 Nov 2011 14:37:42 -0500
Subject: [PATCH] more recommended changes

---
 apps/openmw/mwclass/lockpick.cpp      | 6 ++++--
 apps/openmw/mwrender/objects.cpp      | 2 +-
 apps/openmw/mwworld/physicssystem.hpp | 1 +
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/apps/openmw/mwclass/lockpick.cpp b/apps/openmw/mwclass/lockpick.cpp
index 32f2311b3..c80e5ab7c 100644
--- a/apps/openmw/mwclass/lockpick.cpp
+++ b/apps/openmw/mwclass/lockpick.cpp
@@ -25,7 +25,7 @@ namespace MWClass
         if (!model.empty())
         {
             MWRender::Objects objects = renderingInterface.getObjects();
-            objects.insertBegin(ptr, true, false);
+            objects.insertBegin(ptr, ptr.getRefData().isEnabled(), false);
             objects.insertMesh(ptr, "meshes\\" + model);
         }
     }
@@ -35,8 +35,10 @@ namespace MWClass
         ESMS::LiveCellRef<ESM::Tool, MWWorld::RefData> *ref =
             ptr.get<ESM::Tool>();
 
+
+        const std::string &model = ref->base->model;
         assert (ref->base != NULL);
-        if(ptr.getRefData().getBaseNode()){
+        if(!model.empty()){
             physics.insertObjectPhysics(ptr);
         }
 
diff --git a/apps/openmw/mwrender/objects.cpp b/apps/openmw/mwrender/objects.cpp
index 57e6c6501..8a4216799 100644
--- a/apps/openmw/mwrender/objects.cpp
+++ b/apps/openmw/mwrender/objects.cpp
@@ -66,7 +66,7 @@ void Objects::insertBegin (const MWWorld::Ptr& ptr, bool enabled, bool static_){
     
 }
 void Objects::insertMesh (const MWWorld::Ptr& ptr, const std::string& mesh){
-    Ogre::SceneNode* insert = mRend.getScene()->getSceneNode(ptr.getRefData().getHandle());
+    Ogre::SceneNode* insert = ptr.getRefData().getBaseNode();
     assert(insert);
 
     NifOgre::NIFLoader::load(mesh);
diff --git a/apps/openmw/mwworld/physicssystem.hpp b/apps/openmw/mwworld/physicssystem.hpp
index 8fbcd0521..789c81c45 100644
--- a/apps/openmw/mwworld/physicssystem.hpp
+++ b/apps/openmw/mwworld/physicssystem.hpp
@@ -4,6 +4,7 @@
 #include <vector>
 #include <openengine/ogre/renderer.hpp>
 #include <openengine/bullet/physic.hpp>
+#include "ptr.hpp"
 
 namespace MWWorld
 {