|
|
@ -341,7 +341,6 @@ void WeatherManager::setWeather(const String& weather, bool instant)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
mNextWeather = "";
|
|
|
|
mNextWeather = "";
|
|
|
|
mCurrentWeather = weather;
|
|
|
|
mCurrentWeather = weather;
|
|
|
|
mFirstUpdate = false;
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
else
|
|
|
|
{
|
|
|
|
{
|
|
|
@ -355,6 +354,7 @@ void WeatherManager::setWeather(const String& weather, bool instant)
|
|
|
|
mNextWeather = weather;
|
|
|
|
mNextWeather = weather;
|
|
|
|
mRemainingTransitionTime = mWeatherSettings[mCurrentWeather].mTransitionDelta*24.f*3600;
|
|
|
|
mRemainingTransitionTime = mWeatherSettings[mCurrentWeather].mTransitionDelta*24.f*3600;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
mFirstUpdate = false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
WeatherResult WeatherManager::getResult(const String& weather)
|
|
|
|
WeatherResult WeatherManager::getResult(const String& weather)
|
|
|
|