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

Fix a compiler warning.

Browse source
This commit is contained in:
Mark de Wever 2008-11-24 16:53:53 +00:00
parent 8feddea059
commit 8e4a6ad6c8
1 changed files with 16 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/editor2/editor_map.cpp
View file

@ -27,6 +27,22 @@
namespace editor2 {
namespace {
editor_map_load_exception wrap_exc(const char* type, const std::string& e_msg, const std::string& filename)
{
WRN_ED << type << " error in load map " << filename << ": " << e_msg << "\n";
utils::string_map symbols;
symbols["type"] = type;
const char* error_msg = "There was an error ($type) while loading the file:";
std::string msg = vgettext(error_msg, symbols);
msg += "\n";
msg += e_msg;
return editor_map_load_exception(filename, msg);
}
} // namespace
editor_map::editor_map(const config& terrain_cfg, const std::string& data)
: gamemap(terrain_cfg, data)
, selection_()
@ -56,18 +72,6 @@ editor_map::editor_map(const gamemap& map)
sanity_check();
}
editor_map_load_exception wrap_exc(const char* type, const std::string& e_msg, const std::string& filename)
{
WRN_ED << type << " error in load map " << filename << ": " << e_msg << "\n";
utils::string_map symbols;
symbols["type"] = type;
const char* error_msg = "There was an error ($type) while loading the file:";
std::string msg = vgettext(error_msg, symbols);
msg += "\n";
msg += e_msg;
return editor_map_load_exception(filename, msg);
}
editor_map editor_map::load_from_file(const config& game_config, const std::string& filename)
{
log_scope2(editor, "Loading map " + filename);