upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-07 11:12:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Deprecate [replace_map]map= in favour of [replace_map]map_data=

Browse Source 
This gives greater consistency between similar APIs, and allows macros
intended to drop a map into [scenario] to also work in [replace_map].

(cherry-picked from commit c62a4820fcab36e3c556f698d60e1afa9d242f84)
This commit is contained in:
Celtic Minstrel 2018-03-30 22:30:13 -04:00
parent 75a9a51166
commit 6a698064d6
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/game_events/action_wml.cpp
View File

@ -61,6 +61,7 @@
#include "units/filter.hpp"
#include "wml_exception.hpp"
#include "whiteboard/manager.hpp"
#include "deprecation.hpp"
#include <boost/regex.hpp>
@ -600,11 +601,14 @@ WML_HANDLER_FUNCTION(replace_map,, cfg)
if(!cfg["map_file"].empty()) {
config file_cfg = mp_sync::get_user_choice("map_data", map_choice(cfg["map_file"].str()));
map.read(file_cfg["map_data"].str(), false);
} else if(!cfg["map_data"].empty()) {
map.read(cfg["map_data"], false);
} else {
deprecated_message("[replace_map]map=", DEP_LEVEL::INDEFINITE, "1.16", "Use map_data= instead.");
map.read(cfg["map"], false);
}
} catch(incorrect_map_format_error&) {
const std::string log_map_name = cfg["map"].empty() ? cfg["file"] : std::string("from inline data");
const std::string log_map_name = cfg["map"].empty() ? cfg["map_file"] : std::string("from inline data");
lg::wml_error() << "replace_map: Unable to load map " << log_map_name << std::endl;
return;
} catch(wml_exception& e) {