upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-10 19:57:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add deprecated warnings for [advance]

Browse Source
This commit is contained in:
Celtic Minstrel 2015-08-22 23:43:50 -04:00
parent f0c051d688
commit ad62e1d4fd
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/scripting/game_lua_kernel.cpp
View File

@ -3278,6 +3278,7 @@ static int intf_add_modification(lua_State *L)
std::string sm = m; std::string sm = m;
if (sm == "advance") { // Maintain backwards compatibility if (sm == "advance") { // Maintain backwards compatibility
sm = "advancement"; sm = "advancement";
lg::wml_error << "(Lua) Modifications of type \"advance\" are deprecated, use \"advancement\" instead\n";
} }
if (sm != "advancement" && sm != "object" && sm != "trait") { if (sm != "advancement" && sm != "object" && sm != "trait") {
return luaL_argerror(L, 2, "unknown modification type"); return luaL_argerror(L, 2, "unknown modification type");

3
src/unit.cpp
View File

@ -2069,6 +2069,9 @@ void unit::apply_modifications()
for(size_t i = 0; i != NumModificationTypes; ++i) { for(size_t i = 0; i != NumModificationTypes; ++i) {
const std::string& mod = ModificationTypes[i]; const std::string& mod = ModificationTypes[i];
if(mod == "advance" && modifications_.has_child(mod)) {
lg::wml_error << "[modifications][advance] is deprecated, use [advancement] instead\n";
}
BOOST_FOREACH(const config &m, modifications_.child_range(mod)) { BOOST_FOREACH(const config &m, modifications_.child_range(mod)) {
log_scope("add mod"); log_scope("add mod");
add_modification(ModificationTypes[i], m, true); add_modification(ModificationTypes[i], m, true);