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

Added new Lua function wesnoth.get_villages()

Browse source
This commit is contained in:
Elvish_Hunter 2012-07-21 09:55:26 +00:00
parent f3631cd713
commit c8716ad799
2 changed files with 30 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changelog
View file

@ -150,6 +150,7 @@ Version 1.11.0-svn:
view scrolling has been locked, and false otherwise
* Added == operator for (private, on-map, recall) lua proxy units,
checking for unit identity
* Added wesnoth.get_villages() function
* Multiplayer:
* A New Land:
* Made it so that the "Elvish Shaman" option in the elvish unit selection

29
src/scripting/lua.cpp
View file

@ -3188,6 +3188,34 @@ static int intf_get_locations(lua_State *L)
return 1;
}
/**
* Gets all the villages matching a given filter, or all the villages on the map if no filter is given.
* - Arg 1: WML table (optional).
* - Ret 1: array of integer pairs.
*/
static int intf_get_villages(lua_State *L)
{
std::vector<map_location> locs = resources::game_map->villages();
lua_newtable(L);
int i = 1;
vconfig filter = luaW_checkvconfig(L, 1);
for(std::vector<map_location>::const_iterator it = locs.begin(); it != locs.end(); ++it) {
bool matches = terrain_filter(filter, *resources::units).match(*it);
if (matches) {
lua_createtable(L, 2, 0);
lua_pushinteger(L, it->x + 1);
lua_rawseti(L, -2, 1);
lua_pushinteger(L, it->y + 1);
lua_rawseti(L, -2, 2);
lua_rawseti(L, -2, i);
i++;
}
}
return 1;
}
/**
* Matches a location against the given filter.
* - Args 1,2: integers.
@ -3525,6 +3553,7 @@ LuaKernel::LuaKernel(const config &cfg)
{ "get_units", &intf_get_units },
{ "get_variable", &intf_get_variable },
{ "get_village_owner", &intf_get_village_owner },
{ "get_villages", &intf_get_villages },
{ "highlight_hex", &intf_highlight_hex },
{ "is_enemy", &intf_is_enemy },
{ "lock_view", &intf_lock_view },