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

Provided access to current event context.

Browse source
This commit is contained in:
Guillaume Melquiond 2010-02-07 21:43:29 +00:00
parent afc20aa730
commit f3989149ec
2 changed files with 26 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
data/scenario-test.cfg
View file

@ -838,6 +838,8 @@ Also, 0..9 = $below_ten, one,two,three = $ascii and the bonus answer is $mixed."
#
# On 800x480 a scrollbar should appear.
code = <<
local ec = wesnoth.current.event_context
wesnoth.message(string.format("Unit moved from %d,%d to %d,%d", ec.x2, ec.y2, ec.x1, ec.y1))
local helper = wesnoth.require "lua/helper.lua"
local result = helper.get_user_choice(
{ speaker = "unit", message = "Pick your poison" },

24
src/scripting/lua.cpp
View file

@ -1462,6 +1462,30 @@ static int impl_current_get(lua_State *L)
// Find the corresponding attribute.
return_int_attrib("side", resources::controller->current_side());
return_int_attrib("turn", resources::controller->turn());
if (strcmp(m, "event_context") == 0)
{
const game_events::queued_event &ev = queued_event_context::get();
config cfg;
if (const config &weapon = ev.data.child("first")) {
cfg.add_child("weapon", weapon);
}
if (const config &weapon = ev.data.child("second")) {
cfg.add_child("second_weapon", weapon);
}
if (ev.loc1.valid()) {
cfg["x1"] = str_cast(ev.loc1.x + 1);
cfg["y1"] = str_cast(ev.loc1.y + 1);
}
if (ev.loc2.valid()) {
cfg["x2"] = str_cast(ev.loc2.x + 1);
cfg["y2"] = str_cast(ev.loc2.y + 1);
}
lua_newtable(L);
table_of_wml_config(L, cfg);
return 1;
}
return 0;
}