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

move last lua callbacks (place/remove shroud) to use extraspace

Browse source
This commit is contained in:
Chris Beck 2015-04-10 17:01:49 -04:00
parent 0a4a385e50
commit f14341ce59
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/scripting/game_lua_kernel.cpp
View file

@ -3925,13 +3925,21 @@ const game_events::queued_event & game_lua_kernel::get_event_info() {
}
// Template which allows to push member functions to the lua kernel base into lua as C functions, using a shim
typedef int (game_lua_kernel::*member_callback)(lua_State *L);
typedef int (game_lua_kernel::*member_callback)(lua_State *);
template <member_callback method>
int dispatch(lua_State *L) {
return ((lua_kernel_base::get_lua_kernel<game_lua_kernel>(L)).*method)(L);
}
// Pass a const bool also...
typedef int (game_lua_kernel::*member_callback2)(lua_State *, bool);
template <member_callback2 method, bool b>
int dispatch2(lua_State *L) {
return ((lua_kernel_base::get_lua_kernel<game_lua_kernel>(L)).*method)(L, b);
}
game_lua_kernel::game_lua_kernel(const config &cfg, CVideo * video, game_state & gs, play_controller & pc, reports & reports_object)
: lua_kernel_base(video)
@ -4042,11 +4050,11 @@ game_lua_kernel::game_lua_kernel(const config &cfg, CVideo * video, game_state &
{ "simulate_combat", &dispatch<&game_lua_kernel::intf_simulate_combat > },
{ "synchronize_choice", &dispatch<&game_lua_kernel::intf_synchronize_choice > },
{ "view_locked", &dispatch<&game_lua_kernel::intf_view_locked > },
{ "place_shroud", &dispatch2<&game_lua_kernel::intf_shroud_op, true > },
{ "remove_shroud", &dispatch2<&game_lua_kernel::intf_shroud_op, false > },
{ NULL, NULL }
};
lua_cpp::Reg const cpp_callbacks[] = {
{ "place_shroud", boost::bind(&game_lua_kernel::intf_shroud_op, this, _1, true )},
{ "remove_shroud", boost::bind(&game_lua_kernel::intf_shroud_op, this, _1, false )},
{ NULL, NULL }
};
lua_getglobal(L, "wesnoth");