0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ignore [delay] during preload,prestart and initial lua.

Browse source 
as the ingame ui is not shown yet, [delay] would only result in showing a black screen,

Also in the case of initial lua it might result in crashes because of the threaded loadingscren, or simply because parts of the ui are not initialized yet.
This commit is contained in:
gfgtdf 2018-07-17 13:22:40 +02:00
parent 12a3b973b9
commit 97b5612691
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/scripting/game_lua_kernel.cpp
View file

@ -3296,6 +3296,10 @@ int game_lua_kernel::intf_color_adjust(lua_State *L)
*/
int game_lua_kernel::intf_delay(lua_State *L)
{
if(gamedata().phase() == game_data::PRELOAD || gamedata().phase() == game_data::PRESTART || gamedata().phase() == game_data::INITIAL) {
//don't call play_slice if the game ui is not active yet.
return 0;
}
events::command_disabler command_disabler;
lua_Integer delay = luaL_checkinteger(L, 1);
if(delay == 0) {