From e4f140841e2e9eacb25c671cbe03c61938b1219c Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sat, 12 Jan 2013 08:23:15 +0100
Subject: [PATCH] Make OpenMW work with Ogre 1.9

---
 apps/launcher/graphicspage.cpp           | 1 +
 apps/openmw/mwrender/localmap.cpp        | 1 -
 apps/openmw/mwrender/shadows.cpp         | 5 ++---
 apps/openmw/mwrender/terrainmaterial.hpp | 1 +
 apps/openmw/mwrender/water.cpp           | 3 ---
 components/bsa/bsa_archive.cpp           | 5 +++++
 libs/openengine/ogre/renderer.cpp        | 1 +
 7 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/apps/launcher/graphicspage.cpp b/apps/launcher/graphicspage.cpp
index 2c4f3430c..cc4cbfe7d 100644
--- a/apps/launcher/graphicspage.cpp
+++ b/apps/launcher/graphicspage.cpp
@@ -122,6 +122,7 @@ bool GraphicsPage::setupOgre()
     pluginDir = absPluginPath.string();
 
     Files::loadOgrePlugin(pluginDir, "RenderSystem_GL", *mOgre);
+    Files::loadOgrePlugin(pluginDir, "RenderSystem_GL3Plus", *mOgre);
     Files::loadOgrePlugin(pluginDir, "RenderSystem_Direct3D9", *mOgre);
 
 #ifdef ENABLE_PLUGIN_GL
diff --git a/apps/openmw/mwrender/localmap.cpp b/apps/openmw/mwrender/localmap.cpp
index d878cb86e..b34942d28 100644
--- a/apps/openmw/mwrender/localmap.cpp
+++ b/apps/openmw/mwrender/localmap.cpp
@@ -1,6 +1,5 @@
 #include "localmap.hpp"
 
-#include <OgreOverlayManager.h>
 #include <OgreMaterialManager.h>
 #include <OgreHardwarePixelBuffer.h>
 
diff --git a/apps/openmw/mwrender/shadows.cpp b/apps/openmw/mwrender/shadows.cpp
index 808c8b5d9..595a82294 100644
--- a/apps/openmw/mwrender/shadows.cpp
+++ b/apps/openmw/mwrender/shadows.cpp
@@ -9,9 +9,6 @@
 #include <OgreShadowCameraSetupPSSM.h>
 #include <OgreHardwarePixelBuffer.h>
 
-#include <OgreOverlayContainer.h>
-#include <OgreOverlayManager.h>
-
 #include <extern/shiny/Main/Factory.hpp>
 
 #include "renderconst.hpp"
@@ -125,6 +122,7 @@ void Shadows::recreate()
     // --------------------------------------------------------------------------------------------------------------------
     // --------------------------- Debug overlays to display the content of shadow maps -----------------------------------
     // --------------------------------------------------------------------------------------------------------------------
+    /*
     if (Settings::Manager::getBool("debug", "Shadows"))
     {
         OverlayManager& mgr = OverlayManager::getSingleton();
@@ -181,6 +179,7 @@ void Shadows::recreate()
         if ((overlay = mgr.getByName("DebugOverlay")))
             mgr.destroy(overlay);
     }
+    */
 }
 
 PSSMShadowCameraSetup* Shadows::getPSSMSetup()
diff --git a/apps/openmw/mwrender/terrainmaterial.hpp b/apps/openmw/mwrender/terrainmaterial.hpp
index 3e31b2a58..fe1214cf5 100644
--- a/apps/openmw/mwrender/terrainmaterial.hpp
+++ b/apps/openmw/mwrender/terrainmaterial.hpp
@@ -67,6 +67,7 @@ namespace MWRender
 
             void setGlobalColourMapEnabled(bool enabled);
             void setGlobalColourMap (Ogre::Terrain* terrain, const std::string& name);
+            virtual void setLightmapEnabled(bool) {}
 
         private:
             sh::MaterialInstance* mMaterial;
diff --git a/apps/openmw/mwrender/water.cpp b/apps/openmw/mwrender/water.cpp
index a16a23b26..04a126367 100644
--- a/apps/openmw/mwrender/water.cpp
+++ b/apps/openmw/mwrender/water.cpp
@@ -8,9 +8,6 @@
 #include <OgreCompositorInstance.h>
 #include <OgreCompositorChain.h>
 #include <OgreRoot.h>
-#include <OgreOverlayManager.h>
-#include <OgreOverlayContainer.h>
-#include <OgreOverlayElement.h>
 
 #include "sky.hpp"
 #include "renderingmanager.hpp"
diff --git a/components/bsa/bsa_archive.cpp b/components/bsa/bsa_archive.cpp
index 9913fb8aa..3bff93baa 100644
--- a/components/bsa/bsa_archive.cpp
+++ b/components/bsa/bsa_archive.cpp
@@ -403,6 +403,11 @@ public:
     return new BSAArchive(name);
   }
 
+  virtual Archive* createInstance(const String& name, bool readOnly)
+  {
+    return new BSAArchive(name);
+  }
+
   void destroyInstance( Archive* arch) { delete arch; }
 };
 
diff --git a/libs/openengine/ogre/renderer.cpp b/libs/openengine/ogre/renderer.cpp
index 3cdb00518..ed5cc9b43 100644
--- a/libs/openengine/ogre/renderer.cpp
+++ b/libs/openengine/ogre/renderer.cpp
@@ -192,6 +192,7 @@ void OgreRenderer::configure(const std::string &logPath,
     pluginDir = absPluginPath.string();
 
     Files::loadOgrePlugin(pluginDir, "RenderSystem_GL", *mRoot);
+    Files::loadOgrePlugin(pluginDir, "RenderSystem_GL3Plus", *mRoot);
     Files::loadOgrePlugin(pluginDir, "RenderSystem_Direct3D9", *mRoot);
     Files::loadOgrePlugin(pluginDir, "Plugin_CgProgramManager", *mRoot);