diff options
| author | Adam Borowski <kilobyte@angband.pl> | 2012-04-12 03:09:08 +0200 |
|---|---|---|
| committer | Adam Borowski <kilobyte@angband.pl> | 2012-04-12 03:09:08 +0200 |
| commit | 64d4ef277c5500fa5b4f65a6a96768605ec6fd75 (patch) | |
| tree | 8487dfd6b4af109efadcc60a88fccfb433f69d5a /crawl-ref/source/l_dgn.cc | |
| parent | 7ff52721aa186489a3a27074a2e95e9f0471eb02 (diff) | |
| parent | 3e11d7d1fd1154c0c458eb8482c56aae6c69b7ea (diff) | |
| download | crawl-ref-64d4ef277c5500fa5b4f65a6a96768605ec6fd75.tar.gz crawl-ref-64d4ef277c5500fa5b4f65a6a96768605ec6fd75.zip | |
Merge branch 'master' into portal_branches
Diffstat (limited to 'crawl-ref/source/l_dgn.cc')
| -rw-r--r-- | crawl-ref/source/l_dgn.cc | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/crawl-ref/source/l_dgn.cc b/crawl-ref/source/l_dgn.cc index ce751fc155..c2040fc15a 100644 --- a/crawl-ref/source/l_dgn.cc +++ b/crawl-ref/source/l_dgn.cc @@ -1601,14 +1601,14 @@ LUAFN(_dgn_map_parameters) return clua_stringtable(ls, map_parameters); } -int dgn_push_vault_placement(lua_State *ls, const vault_placement *vp) +static int _dgn_push_vault_placement(lua_State *ls, const vault_placement *vp) { return dlua_push_object_type(ls, VAULT_PLACEMENT_METATABLE, *vp); } LUAFN(_dgn_maps_used_here) { - return clua_gentable(ls, env.level_vaults, dgn_push_vault_placement); + return clua_gentable(ls, env.level_vaults, _dgn_push_vault_placement); } LUAFN(_dgn_vault_at) @@ -1616,13 +1616,9 @@ LUAFN(_dgn_vault_at) GETCOORD(c, 1, 2, map_bounds); vault_placement *place = dgn_vault_at(c); if (place) - { - dgn_push_vault_placement(ls, place); - } + _dgn_push_vault_placement(ls, place); else - { lua_pushnil(ls); - } return 1; } |