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

Moved [delay] implementation to Lua. (Fix for bug #16755.)

Browse source
This commit is contained in:
Guillaume Melquiond 2010-10-02 06:28:56 +00:00
parent c3f2f750bb
commit 66039820b4
2 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
data/lua/wml-tags.lua
View file

@ -539,3 +539,9 @@ function wml_actions.terrain(cfg)
wesnoth.set_terrain(loc[1], loc[2], terrain, cfg.layer, cfg.replace_if_failed) wesnoth.set_terrain(loc[1], loc[2], terrain, cfg.layer, cfg.replace_if_failed)
end end
end end
function wml_actions.delay(cfg)
local delay = tonumber(cfg.time) or
helper.wml_error "[delay] missing required time= attribute."
wesnoth.delay(delay)
end

7
src/game_events.cpp
View file

@ -727,13 +727,6 @@ WML_HANDLER_FUNCTION(colour_adjust, /*event_info*/, cfg)
color_adjust(cfg); color_adjust(cfg);
} }
WML_HANDLER_FUNCTION(delay, /*event_info*/, cfg)
{
game_display &screen = *resources::screen;
screen.delay(cfg["time"]);
}
WML_HANDLER_FUNCTION(scroll, /*event_info*/, cfg) WML_HANDLER_FUNCTION(scroll, /*event_info*/, cfg)
{ {
game_display &screen = *resources::screen; game_display &screen = *resources::screen;