Merge with develop

--HG--
branch : compatibility-develop
hg/compatibility-develop
Nimetu 6 years ago
commit 5ed62187dc

@ -1699,7 +1699,13 @@ int CLuaIHMRyzom::getWeatherValue(CLuaState &ls)
CLuaIHM::checkArgCount(ls, funcName, 0); CLuaIHM::checkArgCount(ls, funcName, 0);
uint64 currDay = RT.getRyzomDay(); uint64 currDay = RT.getRyzomDay();
float currHour = (float) RT.getRyzomTime(); float currHour = (float) RT.getRyzomTime();
ls.push(::getBlendedWeather(currDay, currHour, *WeatherFunctionParams, ContinentMngr.cur()->WeatherFunction)); float weather = 0.f;
if (ContinentMngr.cur())
{
weather = ::getBlendedWeather(currDay, currHour, *WeatherFunctionParams, ContinentMngr.cur()->WeatherFunction);
}
ls.push(weather);
return 1; return 1;
} }

Loading…
Cancel
Save