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

create_engine now catches mapgen_exceptions thrown by generators

Browse source 
It puts those messages in the error_message field of the map entry,
so we get nicer gui handling of the problem.
This commit is contained in:
Chris Beck 2014-11-05 16:09:52 -05:00
parent 6c85b4f4d8
commit c785310f05
1 changed files with 29 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
src/game_initialization/create_engine.cpp
View file

@ -470,30 +470,38 @@ void create_engine::init_generated_level_data()
return;
}
if (!cur_lev->generate_whole_scenario())
{
DBG_MP << "** replacing map ** \n";
try {
if (!cur_lev->generate_whole_scenario())
{
DBG_MP << "** replacing map ** \n";
config data = cur_lev->data();
data["map_data"] = generator_->create_map();
cur_lev->set_data(data);
} else { //scenario generation
DBG_MP << "** replacing scenario ** \n";
config data = generator_->create_scenario();
// Set the scenario to have placing of sides
// based on the terrain they prefer
if (!data.has_attribute("modify_placing")) {
data["modify_placing"] = "true";
}
const std::string& description = cur_lev->data()["description"];
data["description"] = description;
cur_lev->set_data(data);
}
} catch (mapgen_exception & e) {
config data = cur_lev->data();
data["map_data"] = generator_->create_map();
cur_lev->set_data(data);
} else { //scenario generation
DBG_MP << "** replacing scenario ** \n";
config data = generator_->create_scenario();
// Set the scenario to have placing of sides
// based on the terrain they prefer
if (!data.has_attribute("modify_placing")) {
data["modify_placing"] = "true";
}
const std::string& description = cur_lev->data()["description"];
data["description"] = description;
data["error_message"] = e.what();
cur_lev->set_data(data);
}