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

Allow wesnoth.dofile to forward arbitrary arguments to the file's "..."

Browse source
This commit is contained in:
Celtic Minstrel 2017-05-02 22:23:46 -04:00
parent efb0fe05e9
commit 37c0ccafa3
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/scripting/lua_kernel_base.cpp
View file

@ -615,11 +615,13 @@ void lua_kernel_base::interactive_run(char const * prog) {
*/ */
int lua_kernel_base::intf_dofile(lua_State* L) int lua_kernel_base::intf_dofile(lua_State* L)
{ {
lua_rotate(L, 1, -1);
if (lua_fileops::load_file(L) != 1) return 0; if (lua_fileops::load_file(L) != 1) return 0;
//^ should end with the file contents loaded on the stack. actually it will call lua_error otherwise, the return 0 is redundant. //^ should end with the file contents loaded on the stack. actually it will call lua_error otherwise, the return 0 is redundant.
error_handler eh = std::bind(&lua_kernel_base::log_error, this, _1, _2 ); error_handler eh = std::bind(&lua_kernel_base::log_error, this, _1, _2 );
this->protected_call(0, LUA_MULTRET, eh); lua_rotate(L, 1, 1);
this->protected_call(lua_gettop(L) - 1, LUA_MULTRET, eh);
return lua_gettop(L); return lua_gettop(L);
} }