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

transition fix

Browse source
This commit is contained in:
scrawl 2012-02-27 12:21:00 +01:00
parent 8b0ef8f98c
commit c9ceb74e5c
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -328,9 +328,12 @@ void WeatherManager::setWeather(const String& weather, bool instant)
} }
else else
{ {
// if there's another transition that hasn't finished yet, just apply it immediately
if (mNextWeather != "") if (mNextWeather != "")
mCurrentWeather = mNextWeather; {
// transition more than 50% finished?
if (mRemainingTransitionTime/(mWeatherSettings[mCurrentWeather].mTransitionDelta*24.f*60) <= 0.5)
mCurrentWeather = mNextWeather;
}
mNextWeather = weather; mNextWeather = weather;
mRemainingTransitionTime = mWeatherSettings[mCurrentWeather].mTransitionDelta*24.f*60; mRemainingTransitionTime = mWeatherSettings[mCurrentWeather].mTransitionDelta*24.f*60;