From 20f976ddc7aaa894aba85afc4d3776cc8cd8a874 Mon Sep 17 00:00:00 2001
From: Nikolay Kasyanov <corrmage@gmail.com>
Date: Thu, 29 Mar 2012 03:02:26 +0400
Subject: [PATCH 1/3] probably openal initialization fix

---
 apps/openmw/mwsound/openal_output.cpp | 37 ++++++++++++++++++++++++---
 1 file changed, 33 insertions(+), 4 deletions(-)

diff --git a/apps/openmw/mwsound/openal_output.cpp b/apps/openmw/mwsound/openal_output.cpp
index 5122b3a5a5..97a3996896 100644
--- a/apps/openmw/mwsound/openal_output.cpp
+++ b/apps/openmw/mwsound/openal_output.cpp
@@ -426,6 +426,12 @@ void OpenAL_Output::init(const std::string &devname)
     else
         std::cout << "Opened \""<<alcGetString(mDevice, ALC_DEVICE_SPECIFIER)<<"\"" << std::endl;
 
+    ALCint params[5];
+//    params[0] = ALC_MONO_SOURCES;
+//    params[1] = 10;
+//    params[2] = ALC_STEREO_SOURCES;
+//    params[3] = 10;
+//    params[4] = 0;
     mContext = alcCreateContext(mDevice, NULL);
     if(!mContext || alcMakeContextCurrent(mContext) == ALC_FALSE)
         fail(std::string("Failed to setup context: ")+alcGetString(mDevice, alcGetError(mDevice)));
@@ -433,6 +439,18 @@ void OpenAL_Output::init(const std::string &devname)
     alDistanceModel(AL_LINEAR_DISTANCE_CLAMPED);
     throwALerror();
 
+//    ALCint size;
+//    alcGetIntegerv( mDevice, ALC_ATTRIBUTES_SIZE, 1, &size);
+//    std::vector<ALCint> attrs(size);
+//    alcGetIntegerv( mDevice, ALC_ALL_ATTRIBUTES, size, &attrs[0] );
+//    for(int i=0; i<attrs.size(); ++i)
+//    {
+//       if( attrs[i] == ALC_MONO_SOURCES )
+//       {
+//          std::cout << "max mono sources: " << attrs.at(i+1) << std::endl;
+//       }
+//    }
+
     ALCint maxmono=0, maxstereo=0;
     alcGetIntegerv(mDevice, ALC_MONO_SOURCES, 1, &maxmono);
     alcGetIntegerv(mDevice, ALC_STEREO_SOURCES, 1, &maxstereo);
@@ -440,13 +458,24 @@ void OpenAL_Output::init(const std::string &devname)
 
     try
     {
-        ALCuint maxtotal = std::min<ALCuint>(maxmono+maxstereo, 256);
-        for(size_t i = 0;i < maxtotal;i++)
+        ALCuint maxtotal = 256;//std::min<ALCuint>(maxmono+maxstereo, 256);
+        bool stop = false;
+        for(size_t i = 0;i < maxtotal && !stop;i++)
         {
             ALuint src = 0;
             alGenSources(1, &src);
-            throwALerror();
-            mFreeSources.push_back(src);
+
+            ALenum err = alGetError();
+            if(err != AL_NO_ERROR)
+            {
+                stop = true;
+                std::cout << "Stopping source generation at " << i << std::endl;
+            }
+            else
+            {
+                mFreeSources.push_back(src);
+            }
+            //throwALerror();
         }
     }
     catch(std::exception &e)

From b6aa8925f49ae38958074549ea9722916ab6ebf8 Mon Sep 17 00:00:00 2001
From: Nikolay Kasyanov <corrmage@gmail.com>
Date: Fri, 30 Mar 2012 00:12:38 +0400
Subject: [PATCH 2/3] (Temporary) workaround for broken OpenAL implementations
 that doesn't return meaningful max counts of sources

---
 apps/openmw/mwsound/openal_output.cpp | 53 ++++++++++++---------------
 1 file changed, 23 insertions(+), 30 deletions(-)

diff --git a/apps/openmw/mwsound/openal_output.cpp b/apps/openmw/mwsound/openal_output.cpp
index 97a3996896..0417596834 100644
--- a/apps/openmw/mwsound/openal_output.cpp
+++ b/apps/openmw/mwsound/openal_output.cpp
@@ -426,12 +426,6 @@ void OpenAL_Output::init(const std::string &devname)
     else
         std::cout << "Opened \""<<alcGetString(mDevice, ALC_DEVICE_SPECIFIER)<<"\"" << std::endl;
 
-    ALCint params[5];
-//    params[0] = ALC_MONO_SOURCES;
-//    params[1] = 10;
-//    params[2] = ALC_STEREO_SOURCES;
-//    params[3] = 10;
-//    params[4] = 0;
     mContext = alcCreateContext(mDevice, NULL);
     if(!mContext || alcMakeContextCurrent(mContext) == ALC_FALSE)
         fail(std::string("Failed to setup context: ")+alcGetString(mDevice, alcGetError(mDevice)));
@@ -439,18 +433,6 @@ void OpenAL_Output::init(const std::string &devname)
     alDistanceModel(AL_LINEAR_DISTANCE_CLAMPED);
     throwALerror();
 
-//    ALCint size;
-//    alcGetIntegerv( mDevice, ALC_ATTRIBUTES_SIZE, 1, &size);
-//    std::vector<ALCint> attrs(size);
-//    alcGetIntegerv( mDevice, ALC_ALL_ATTRIBUTES, size, &attrs[0] );
-//    for(int i=0; i<attrs.size(); ++i)
-//    {
-//       if( attrs[i] == ALC_MONO_SOURCES )
-//       {
-//          std::cout << "max mono sources: " << attrs.at(i+1) << std::endl;
-//       }
-//    }
-
     ALCint maxmono=0, maxstereo=0;
     alcGetIntegerv(mDevice, ALC_MONO_SOURCES, 1, &maxmono);
     alcGetIntegerv(mDevice, ALC_STEREO_SOURCES, 1, &maxstereo);
@@ -458,24 +440,35 @@ void OpenAL_Output::init(const std::string &devname)
 
     try
     {
-        ALCuint maxtotal = 256;//std::min<ALCuint>(maxmono+maxstereo, 256);
-        bool stop = false;
-        for(size_t i = 0;i < maxtotal && !stop;i++)
+        ALCuint maxtotal = std::min<ALCuint>(maxmono+maxstereo, 256);
+        if (maxtotal == 0) // workaround for broken implementations
         {
-            ALuint src = 0;
-            alGenSources(1, &src);
-
-            ALenum err = alGetError();
-            if(err != AL_NO_ERROR)
+            maxtotal = 256;
+            bool stop = false;
+            for(size_t i = 0;i < maxtotal && !stop;i++) // generate source until error returned
             {
-                stop = true;
-                std::cout << "Stopping source generation at " << i << std::endl;
+                ALuint src = 0;
+                alGenSources(1, &src);
+                ALenum err = alGetError();
+                if(err != AL_NO_ERROR)
+                {
+                    stop = true;
+                }
+                else
+                {
+                    mFreeSources.push_back(src);
+                }
             }
-            else
+        }
+        else // normal case
+        {
+            for(size_t i = 0;i < maxtotal;i++)
             {
+                ALuint src = 0;
+                alGenSources(1, &src);
+                throwALerror();
                 mFreeSources.push_back(src);
             }
-            //throwALerror();
         }
     }
     catch(std::exception &e)

From d5c49fa03648081f796f8cdbba4fefbf3e81c05e Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Fri, 30 Mar 2012 10:12:28 +0200
Subject: [PATCH 3/3] getWaterLevel use CellStore ; attempted fix for morrowind
 without tribunal

---
 apps/openmw/mwscript/cellextensions.cpp |  4 ++--
 components/esm/loadcell.cpp             | 10 ++++++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/apps/openmw/mwscript/cellextensions.cpp b/apps/openmw/mwscript/cellextensions.cpp
index 155393f9e6..d69c42ab34 100644
--- a/apps/openmw/mwscript/cellextensions.cpp
+++ b/apps/openmw/mwscript/cellextensions.cpp
@@ -142,8 +142,8 @@ namespace MWScript
                     InterpreterContext& context
                         = static_cast<InterpreterContext&> (runtime.getContext());
 
-                    const ESM::Cell *cell = context.getWorld().getPlayer().getPlayer().getCell()->cell;
-                    runtime.push (cell->water);
+                    MWWorld::Ptr::CellStore *cell = context.getWorld().getPlayer().getPlayer().getCell();
+                    runtime.push (cell->mWaterLevel);
                 }
         };
 
diff --git a/components/esm/loadcell.cpp b/components/esm/loadcell.cpp
index 6bc12c5cb1..158cc08673 100644
--- a/components/esm/loadcell.cpp
+++ b/components/esm/loadcell.cpp
@@ -21,8 +21,14 @@ void Cell::load(ESMReader &esm)
     if (data.flags & Interior)
     {
         // Interior cells
-
-        esm.getHNT(water, "WHGT", 4);
+        if (esm.isNextSub("INTV"))
+        {
+            int waterl;
+            esm.getHT(waterl);
+            water = (float) waterl;
+        }
+        else if (esm.isNextSub("WHGT"))
+            esm.getHT(water);
 
         // Quasi-exterior cells have a region (which determines the
         // weather), pure interior cells have ambient lighting