Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Fixed: Crash in lua getWeatherValue() when continent was not loaded

Browse source 
--HG--
branch : develop
This commit is contained in:
Nimetu 2019-01-13 09:08:08 +02:00
parent 6c1d44bc51
commit ec9a0e6d38
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
code/ryzom/client/src/interface_v3/lua_ihm_ryzom.cpp
View file

@ -1688,7 +1688,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;
} }