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

Moved [scroll_to] and [scroll_to_unit] implementations to Lua.

Browse source
This commit is contained in:
Guillaume Melquiond 2010-07-19 13:58:18 +00:00
parent 4f59c3f5a5
commit c253313def
2 changed files with 10 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -337,3 +337,13 @@ function wml_actions.switch(cfg)
end
end
end
function wml_actions.scroll_to(cfg)
wesnoth.scroll_to_tile(cfg.x, cfg.y, cfg.check_fogged)
end
function wml_actions.scroll_to_unit(cfg)
local u = wesnoth.get_units(cfg)[1]
if not u then return end
wesnoth.scroll_to_tile(u.x, u.y, cfg.check_fogged)
end

21
src/game_events.cpp
View file

@ -776,27 +776,6 @@ WML_HANDLER_FUNCTION(scroll, /*event_info*/, cfg)
screen.draw(true,true);
}
WML_HANDLER_FUNCTION(scroll_to, /*event_info*/, cfg)
{
game_display &screen = *resources::screen;
const map_location loc = cfg_to_loc(cfg);
std::string check_fogged = cfg["check_fogged"];
screen.scroll_to_tile(loc, game_display::SCROLL, utils::string_bool(check_fogged, false));
}
WML_HANDLER_FUNCTION(scroll_to_unit, /*event_info*/, cfg)
{
unit_map::const_iterator u;
for (u = resources::units->begin(); u != resources::units->end(); ++u){
if (game_events::unit_matches_filter(*u, cfg))
break;
}
std::string check_fogged = cfg["check_fogged"];
if (u != resources::units->end()) {
resources::screen->scroll_to_tile(u->get_location(), game_display::SCROLL, utils::string_bool(check_fogged, false));
}
}
// store time of day config in a WML variable; useful for those who
// are too lazy to calculate the corresponding time of day for a given turn,
// or if the turn / time-of-day sequence mutates in a scenario.