From 5d7eb11596be16f9426f40535b4e422774b0e36c Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Wed, 31 Dec 2014 21:04:13 +0100
Subject: [PATCH] Fix lights being rendered on the map (broken by
 d55fe43fc95bf)

---
 apps/openmw/mwrender/actors.cpp           | 14 ++++++++++++++
 apps/openmw/mwrender/actors.hpp           |  5 ++++-
 apps/openmw/mwrender/objects.cpp          | 14 --------------
 apps/openmw/mwrender/objects.hpp          |  3 ---
 apps/openmw/mwrender/renderingmanager.cpp |  4 ++--
 5 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/apps/openmw/mwrender/actors.cpp b/apps/openmw/mwrender/actors.cpp
index 06acf4b3c..db666e890 100644
--- a/apps/openmw/mwrender/actors.cpp
+++ b/apps/openmw/mwrender/actors.cpp
@@ -198,4 +198,18 @@ void Actors::updateObjectCell(const MWWorld::Ptr &old, const MWWorld::Ptr &cur)
     mRendering->updateWaterRippleEmitterPtr (old, cur);
 }
 
+void Actors::enableLights()
+{
+    PtrAnimationMap::const_iterator it = mAllActors.begin();
+    for(;it != mAllActors.end();++it)
+        it->second->enableLights(true);
+}
+
+void Actors::disableLights()
+{
+    PtrAnimationMap::const_iterator it = mAllActors.begin();
+    for(;it != mAllActors.end();++it)
+        it->second->enableLights(false);
+}
+
 }
diff --git a/apps/openmw/mwrender/actors.hpp b/apps/openmw/mwrender/actors.hpp
index 177c8a732..f81082e41 100644
--- a/apps/openmw/mwrender/actors.hpp
+++ b/apps/openmw/mwrender/actors.hpp
@@ -42,9 +42,12 @@ namespace MWRender
         void insertNPC(const MWWorld::Ptr& ptr);
         void insertCreature (const MWWorld::Ptr& ptr, bool weaponsShields);
         void insertActivator (const MWWorld::Ptr& ptr, bool addLight=false);
-         bool deleteObject (const MWWorld::Ptr& ptr);
+        bool deleteObject (const MWWorld::Ptr& ptr);
         ///< \return found?
 
+        void enableLights();
+        void disableLights();
+
         void removeCell(MWWorld::CellStore* store);
 
         void update (Ogre::Camera* camera);
diff --git a/apps/openmw/mwrender/objects.cpp b/apps/openmw/mwrender/objects.cpp
index 96cce178e..965083019 100644
--- a/apps/openmw/mwrender/objects.cpp
+++ b/apps/openmw/mwrender/objects.cpp
@@ -237,20 +237,6 @@ Ogre::AxisAlignedBox Objects::getDimensions(MWWorld::CellStore* cell)
     return mBounds[cell];
 }
 
-void Objects::enableLights()
-{
-    PtrAnimationMap::const_iterator it = mObjects.begin();
-    for(;it != mObjects.end();++it)
-        it->second->enableLights(true);
-}
-
-void Objects::disableLights()
-{
-    PtrAnimationMap::const_iterator it = mObjects.begin();
-    for(;it != mObjects.end();++it)
-        it->second->enableLights(false);
-}
-
 void Objects::update(float dt, Ogre::Camera* camera)
 {
     PtrAnimationMap::const_iterator it = mObjects.begin();
diff --git a/apps/openmw/mwrender/objects.hpp b/apps/openmw/mwrender/objects.hpp
index 02e974e2d..adfe5ca26 100644
--- a/apps/openmw/mwrender/objects.hpp
+++ b/apps/openmw/mwrender/objects.hpp
@@ -45,9 +45,6 @@ public:
 
     ObjectAnimation* getAnimation(const MWWorld::Ptr &ptr);
 
-    void enableLights();
-    void disableLights();
-
     void update (float dt, Ogre::Camera* camera);
     ///< per-frame update
 
diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp
index 2cddbce75..33649ea7c 100644
--- a/apps/openmw/mwrender/renderingmanager.cpp
+++ b/apps/openmw/mwrender/renderingmanager.cpp
@@ -677,13 +677,13 @@ void RenderingManager::writeFog(MWWorld::CellStore* cell)
 
 void RenderingManager::disableLights(bool sun)
 {
-    mObjects->disableLights();
+    mActors->disableLights();
     sunDisable(sun);
 }
 
 void RenderingManager::enableLights(bool sun)
 {
-    mObjects->enableLights();
+    mActors->enableLights();
     sunEnable(sun);
 }