Correction to the e9844e1 commit.

Restored interrior check in WeatherManager::update(). Signed-off-by: Lukasz Gromanowski <[email protected]>
Zhang-Yi · Jan 1, 2014 · 722469d · 722469d
1 parent 101813f
commit 722469d
Showing 1 changed file with 32 additions and 29 deletions.
diff --git a/apps/openmw/mwworld/weather.cpp b/apps/openmw/mwworld/weather.cpp
@@ -324,6 +324,17 @@ void WeatherManager::update(float duration)
 
     mWeatherUpdateTime -= timePassed;
 
+    MWBase::World* world = MWBase::Environment::get().getWorld();
+    const bool exterior = (world->isCellExterior() || world->isCellQuasiExterior());
+    if (!exterior)
+    {
+        mRendering->sunDisable(false);
+        mRendering->skyDisable();
+        mRendering->getSkyManager()->setLightningStrength(0.f);
+        stopSounds(true);
+        return;
+    }
+
     switchToNextWeather(false);
 
     if (mNextWeather != "")
@@ -676,41 +687,33 @@ float WeatherManager::getWindSpeed() const
 void WeatherManager::switchToNextWeather(bool instantly)
 {
     MWBase::World* world = MWBase::Environment::get().getWorld();
-    const bool exterior = (world->isCellExterior() || world->isCellQuasiExterior());
-    if (!exterior)
+    if (world->isCellExterior() || world->isCellQuasiExterior())
     {
-        mRendering->sunDisable(false);
-        mRendering->skyDisable();
-        mRendering->getSkyManager()->setLightningStrength(0.f);
-        stopSounds(true);
-        return;
-    }
-
-    // Exterior
-    std::string regionstr = Misc::StringUtils::lowerCase(world->getPlayer().getPlayer().getCell()->mCell->mRegion);
-
-    if (mWeatherUpdateTime <= 0 || regionstr != mCurrentRegion)
-    {
-        mCurrentRegion = regionstr;
-        mWeatherUpdateTime = mHoursBetweenWeatherChanges * 3600;
-
-        std::string weatherType = "clear";
+        std::string regionstr = Misc::StringUtils::lowerCase(world->getPlayer().getPlayer().getCell()->mCell->mRegion);
 
-        if (mRegionOverrides.find(regionstr) != mRegionOverrides.end())
-        {
-            weatherType = mRegionOverrides[regionstr];
-        }
-        else
+        if (mWeatherUpdateTime <= 0 || regionstr != mCurrentRegion)
         {
-            // get weather probabilities for the current region
-            const ESM::Region *region = world->getStore().get<ESM::Region>().search (regionstr);
+            mCurrentRegion = regionstr;
+            mWeatherUpdateTime = mHoursBetweenWeatherChanges * 3600;
+
+            std::string weatherType = "clear";
 
-            if (region != 0)
+            if (mRegionOverrides.find(regionstr) != mRegionOverrides.end())
             {
-                weatherType = nextWeather(region);
+                weatherType = mRegionOverrides[regionstr];
+            }
+            else
+            {
+                // get weather probabilities for the current region
+                const ESM::Region *region = world->getStore().get<ESM::Region>().search (regionstr);
+
+                if (region != 0)
+                {
+                    weatherType = nextWeather(region);
+                }
             }
-        }
 
-        setWeather(weatherType, instantly);
+            setWeather(weatherType, instantly);
+        }
     }
 }