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

Promote wesnoth.game_config to lua_kernel_base

Browse source
This commit is contained in:
Celtic Minstrel 2017-05-23 23:42:25 -04:00
parent 99abe9d41e
commit 8febe037db
4 changed files with 45 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
src/scripting/game_lua_kernel.cpp
View file

@ -1234,20 +1234,9 @@ int game_lua_kernel::impl_game_config_get(lua_State *L)
char const *m = luaL_checkstring(L, 2);
// Find the corresponding attribute.
return_int_attrib("base_income", game_config::base_income);
return_int_attrib("village_income", game_config::village_income);
return_int_attrib("village_support", game_config::village_support);
return_int_attrib("poison_amount", game_config::poison_amount);
return_int_attrib("rest_heal_amount", game_config::rest_heal_amount);
return_int_attrib("recall_cost", game_config::recall_cost);
return_int_attrib("kill_experience", game_config::kill_experience);
return_int_attrib("last_turn", tod_man().number_of_turns());
return_string_attrib("version", game_config::version);
return_string_attrib("next_scenario", gamedata().next_scenario());
return_string_attrib("theme", gamedata().get_theme());
return_bool_attrib("debug", game_config::debug);
return_bool_attrib("debug_lua", game_config::debug_lua);
return_bool_attrib("mp_debug", game_config::mp_debug);
return_string_attrib("scenario_id", gamedata().get_id());
return_vector_string_attrib("defeat_music", gamedata().get_defeat_music());
return_vector_string_attrib("victory_music", gamedata().get_victory_music());
@ -1270,7 +1259,7 @@ int game_lua_kernel::impl_game_config_get(lua_State *L)
}
return_string_attrib("eras", eras_list);
}
return 0;
return lua_kernel_base::impl_game_config_get(L);
}
/**
@ -1301,9 +1290,7 @@ int game_lua_kernel::impl_game_config_set(lua_State *L)
);
modify_vector_string_attrib("defeat_music", gamedata().set_defeat_music(std::move(value)));
modify_vector_string_attrib("victory_music", gamedata().set_victory_music(std::move(value)));
std::string err_msg = "unknown modifiable property of game_config: ";
err_msg += m;
return luaL_argerror(L, 2, err_msg.c_str());
return lua_kernel_base::impl_game_config_set(L);
}
/**
@ -4111,22 +4098,6 @@ game_lua_kernel::game_lua_kernel(game_state & gs, play_controller & pc, reports
ai::lua_ai_context::init(L);
// Create the game_config variable with its metatable.
cmd_log_ << "Adding game_config table...\n";
lua_getglobal(L, "wesnoth");
lua_newuserdata(L, 0);
lua_createtable(L, 0, 3);
lua_pushcfunction(L, &dispatch<&game_lua_kernel::impl_game_config_get>);
lua_setfield(L, -2, "__index");
lua_pushcfunction(L, &dispatch<&game_lua_kernel::impl_game_config_set>);
lua_setfield(L, -2, "__newindex");
lua_pushstring(L, "game config");
lua_setfield(L, -2, "__metatable");
lua_setmetatable(L, -2);
lua_setfield(L, -2, "game_config");
lua_pop(L, 1);
// Create the current variable with its metatable.
cmd_log_ << "Adding wesnoth current table...\n";

4
src/scripting/game_lua_kernel.hpp
View file

@ -99,8 +99,8 @@ class game_lua_kernel : public lua_kernel_base
int intf_get_mouseover_tile(lua_State *L);
int intf_get_selected_tile(lua_State *L);
int intf_get_starting_location(lua_State* L);
int impl_game_config_get(lua_State *L);
int impl_game_config_set(lua_State *L);
int impl_game_config_get(lua_State *L) override;
int impl_game_config_set(lua_State *L) override;
int impl_current_get(lua_State *L);
int intf_clear_messages(lua_State*);
int intf_end_level(lua_State*);

38
src/scripting/lua_kernel_base.cpp
View file

@ -516,6 +516,22 @@ lua_kernel_base::lua_kernel_base()
lua_setfield(L, -2, "map");
lua_pop(L, 1);
// Create the game_config variable with its metatable.
cmd_log_ << "Adding game_config table...\n";
lua_getglobal(L, "wesnoth");
lua_newuserdata(L, 0);
lua_createtable(L, 0, 3);
lua_pushcfunction(L, &dispatch<&lua_kernel_base::impl_game_config_get>);
lua_setfield(L, -2, "__index");
lua_pushcfunction(L, &dispatch<&lua_kernel_base::impl_game_config_set>);
lua_setfield(L, -2, "__newindex");
lua_pushstring(L, "game config");
lua_setfield(L, -2, "__metatable");
lua_setmetatable(L, -2);
lua_setfield(L, -2, "game_config");
lua_pop(L, 1);
// Add mersenne twister rng wrapper
cmd_log_ << "Adding rng tables...\n";
lua_rng::load_tables(L);
@ -776,6 +792,28 @@ int lua_kernel_base::intf_kernel_type(lua_State* L)
lua_push(L, my_name());
return 1;
}
int lua_kernel_base::impl_game_config_get(lua_State* L)
{
char const *m = luaL_checkstring(L, 2);
return_int_attrib("base_income", game_config::base_income);
return_int_attrib("village_income", game_config::village_income);
return_int_attrib("village_support", game_config::village_support);
return_int_attrib("poison_amount", game_config::poison_amount);
return_int_attrib("rest_heal_amount", game_config::rest_heal_amount);
return_int_attrib("recall_cost", game_config::recall_cost);
return_int_attrib("kill_experience", game_config::kill_experience);
return_string_attrib("version", game_config::version);
return_bool_attrib("debug", game_config::debug);
return_bool_attrib("debug_lua", game_config::debug_lua);
return_bool_attrib("mp_debug", game_config::mp_debug);
return 0;
}
int lua_kernel_base::impl_game_config_set(lua_State* L)
{
std::string err_msg = "unknown modifiable property of game_config: ";
err_msg += luaL_checkstring(L, 2);
return luaL_argerror(L, 2, err_msg.c_str());
}
/**
* Loads the "package" package into the Lua environment.
* This action is inherently unsafe, as Lua scripts will now be able to

3
src/scripting/lua_kernel_base.hpp
View file

@ -139,6 +139,9 @@ protected:
int intf_require(lua_State * L);
int intf_kernel_type(lua_State* L);
virtual int impl_game_config_get(lua_State* L);
virtual int impl_game_config_set(lua_State* L);
private:
static lua_kernel_base*& get_lua_kernel_base_ptr(lua_State *L);
std::vector<std::tuple<std::string, std::string>> registered_widget_definitions_;