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

Fix changeWeather

Browse source
This commit is contained in:
scrawl 2013-04-28 05:29:34 +02:00
parent 3669d0a998
commit db78d15fc4
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -289,7 +289,7 @@ void WeatherManager::update(float duration)
if (exterior) if (exterior)
{ {
std::string regionstr = MWBase::Environment::get().getWorld()->getPlayer().getPlayer().getCell()->mCell->mRegion; std::string regionstr = Misc::StringUtils::lowerCase(MWBase::Environment::get().getWorld()->getPlayer().getPlayer().getCell()->mCell->mRegion);
Misc::StringUtils::toLower(regionstr); Misc::StringUtils::toLower(regionstr);
if (mWeatherUpdateTime <= 0 || regionstr != mCurrentRegion) if (mWeatherUpdateTime <= 0 || regionstr != mCurrentRegion)
@ -621,6 +621,10 @@ unsigned int WeatherManager::getWeatherID() const
void WeatherManager::changeWeather(const std::string& region, const unsigned int id) void WeatherManager::changeWeather(const std::string& region, const unsigned int id)
{ {
// make sure this region exists
const ESM::Region *reg =
MWBase::Environment::get().getWorld()->getStore().get<ESM::Region>().find(region);
std::string weather; std::string weather;
if (id==0) if (id==0)
weather = "clear"; weather = "clear";
@ -645,5 +649,9 @@ void WeatherManager::changeWeather(const std::string& region, const unsigned int
else else
weather = "clear"; weather = "clear";
mRegionOverrides[region] = weather; mRegionOverrides[Misc::StringUtils::lowerCase(region)] = weather;
std::string playerRegion = MWBase::Environment::get().getWorld()->getPlayer().getPlayer().getCell()->mCell->mRegion;
if (Misc::StringUtils::ciEqual(region, playerRegion))
setWeather(weather);
} }