From 0b3bb2719f30b0575b37f14108f3515933dddaca Mon Sep 17 00:00:00 2001
From: Jason Hooks <Hooks@.(none)>
Date: Sat, 12 Nov 2011 00:19:22 -0500
Subject: [PATCH] Fixing some errors

---
 apps/openmw/mwclass/light.cpp               | 2 +-
 apps/openmw/mwclass/lockpick.cpp            | 1 -
 apps/openmw/mwrender/renderinginterface.hpp | 2 ++
 apps/openmw/mwrender/renderingmanager.cpp   | 1 -
 apps/openmw/mwrender/renderingmanager.hpp   | 7 ++++++-
 apps/openmw/mwworld/class.hpp               | 5 ++++-
 6 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/apps/openmw/mwclass/light.cpp b/apps/openmw/mwclass/light.cpp
index 8e7f32a6c..3fb455914 100644
--- a/apps/openmw/mwclass/light.cpp
+++ b/apps/openmw/mwclass/light.cpp
@@ -36,7 +36,7 @@ namespace MWClass
             const float g = ((color >> 8) & 0xFF) / 255.0f;
             const float b = ((color >> 16) & 0xFF) / 255.0f;
             const float radius = float (ref->base->data.radius);
-            objects.insertLight (r, g, b, radius);
+            objects.insertLight (ptr, r, g, b, radius);
         }
     }
 
diff --git a/apps/openmw/mwclass/lockpick.cpp b/apps/openmw/mwclass/lockpick.cpp
index c80e5ab7c..8e782bb0f 100644
--- a/apps/openmw/mwclass/lockpick.cpp
+++ b/apps/openmw/mwclass/lockpick.cpp
@@ -9,7 +9,6 @@
 #include "../mwworld/actiontake.hpp"
 
 #include "../mwrender/cellimp.hpp"
-#include "../mwrender/renderinginterface.hpp"
 #include "containerutil.hpp"
 
 namespace MWClass
diff --git a/apps/openmw/mwrender/renderinginterface.hpp b/apps/openmw/mwrender/renderinginterface.hpp
index 28f3b61fc..fed1fd3ec 100644
--- a/apps/openmw/mwrender/renderinginterface.hpp
+++ b/apps/openmw/mwrender/renderinginterface.hpp
@@ -1,6 +1,8 @@
 #include "objects.hpp"
 #include "npcs.hpp"
 #include "creatures.hpp"
+#include "player.hpp"
+#define RENDERING_INTERFACE 1
 namespace MWRender{
 class RenderingInterface{
     public:
diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp
index 39c1bca7a..9242fac67 100644
--- a/apps/openmw/mwrender/renderingmanager.cpp
+++ b/apps/openmw/mwrender/renderingmanager.cpp
@@ -13,7 +13,6 @@
 #include "../mwworld/ptr.hpp"
 #include <components/esm/loadstat.hpp>
 
-#include "player.hpp"
 
 
 using namespace MWRender;
diff --git a/apps/openmw/mwrender/renderingmanager.hpp b/apps/openmw/mwrender/renderingmanager.hpp
index 0508fa54d..f3bc7005d 100644
--- a/apps/openmw/mwrender/renderingmanager.hpp
+++ b/apps/openmw/mwrender/renderingmanager.hpp
@@ -4,7 +4,9 @@
 
 #include "sky.hpp"
 #include "debugging.hpp"
-#include "renderinginterface.hpp"
+//Commented out for now, possibly do an ifdef if necessary, cla
+
+
 
 #include <utility>
 #include <openengine/ogre/renderer.hpp>
@@ -17,6 +19,9 @@
 
 #include <boost/filesystem.hpp>
 
+#ifndef RENDERING_INTERFACE
+#include "renderinginterface.hpp"
+#endif
 
 
 namespace Ogre
diff --git a/apps/openmw/mwworld/class.hpp b/apps/openmw/mwworld/class.hpp
index 706b11aaa..44de4888f 100644
--- a/apps/openmw/mwworld/class.hpp
+++ b/apps/openmw/mwworld/class.hpp
@@ -9,8 +9,11 @@
 #include "action.hpp"
 #include "containerstore.hpp"
 #include "refdata.hpp"
-#include "../mwrender/renderinginterface.hpp"
+
 #include "physicssystem.hpp"
+#ifndef RENDERING_INTERFACE
+#include "../mwrender/renderinginterface.hpp"
+#endif
 
 namespace Ogre
 {