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

Lua mapgen: Fix create_map being required for scenario generation

Browse source 
This also enables the used of create_scenario for map generation.
This commit is contained in:
Celtic Minstrel 2016-10-28 17:12:36 -04:00
parent a91a98f78a
commit ff004b40b8
2 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/generators/lua_map_generator.cpp
View file

@ -32,6 +32,10 @@ lua_map_generator::lua_map_generator(const config & cfg)
const char* required[] = {"id", "config_name", "create_map"};
for (std::string req : required) {
if (!cfg.has_attribute(req)) {
if(req == "create_map" && cfg.has_attribute("create_scenario")) {
// One of these is required, but not both
continue;
}
std::string msg = "Error when constructing a lua map generator -- missing a required attribute '";
msg += req + "'\n";
msg += "Config was '" + cfg.debug() + "'";
@ -54,6 +58,10 @@ void lua_map_generator::user_config()
std::string lua_map_generator::create_map(boost::optional<uint32_t> seed)
{
if(create_map_.empty()) {
return map_generator::create_map(seed);
}
try {
return lk_.create_map(create_map_.c_str(), generator_data_, seed);
} catch (game::lua_error & e) {

4
src/generators/map_generator.cpp
View file

@ -34,6 +34,10 @@ config map_generator::create_scenario(boost::optional<uint32_t> randomseed)
res["map_data"] = create_map(randomseed);
return res;
}
std::string map_generator::create_map(boost::optional<uint32_t> randomseed)
{
return create_scenario(randomseed)["map_data"];
}
/**
by default we don't allow user configs.
*/