teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

Merge remote-tracking branch 'lgro/issue417_apply_weather_instantly_when_teleporting'

Browse source
This commit is contained in:
Marc Zinnschlag 2014-01-01 19:47:11 +01:00
commit 1f4c192bf6
1 changed files with 32 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

61
apps/openmw/mwworld/weather.cpp
View file

@ -324,6 +324,17 @@ void WeatherManager::update(float duration)
mWeatherUpdateTime -= timePassed; 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); switchToNextWeather(false);
if (mNextWeather != "") if (mNextWeather != "")
@ -683,41 +694,33 @@ bool WeatherManager::isDark() const
void WeatherManager::switchToNextWeather(bool instantly) void WeatherManager::switchToNextWeather(bool instantly)
{ {
MWBase::World* world = MWBase::Environment::get().getWorld(); MWBase::World* world = MWBase::Environment::get().getWorld();
const bool exterior = (world->isCellExterior() || world->isCellQuasiExterior()); if (world->isCellExterior() || world->isCellQuasiExterior())
if (!exterior)
{ {
mRendering->sunDisable(false); std::string regionstr = Misc::StringUtils::lowerCase(world->getPlayer().getPlayer().getCell()->mCell->mRegion);
mRendering->skyDisable();
mRendering->getSkyManager()->setLightningStrength(0.f);
stopSounds(true);
return;
}
// Exterior if (mWeatherUpdateTime <= 0 || regionstr != mCurrentRegion)
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";
if (mRegionOverrides.find(regionstr) != mRegionOverrides.end())
{ {
weatherType = mRegionOverrides[regionstr]; mCurrentRegion = regionstr;
} mWeatherUpdateTime = mHoursBetweenWeatherChanges * 3600;
else
{
// get weather probabilities for the current region
const ESM::Region *region = world->getStore().get<ESM::Region>().search (regionstr);
if (region != 0) std::string weatherType = "clear";
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);
setWeather(weatherType, instantly); if (region != 0)
{
weatherType = nextWeather(region);
}
}
setWeather(weatherType, instantly);
}
} }
} }