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

Variable: remove asserts on resources::gamedata absence

Browse source 
In the case of as_nonempty_range, the function was rewritten to remove absolute reliance on gamedata.
In the other case, we simply silently return now.
This commit is contained in:
Charles Dang 2017-04-09 04:57:09 +11:00
parent 7364d72860
commit 4bc0ac0041
1 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/variable.cpp
View file

@ -42,17 +42,17 @@ namespace
const config as_nonempty_range_default = config_of("_", config());
config::const_child_itors as_nonempty_range(const std::string& varname)
{
assert(resources::gamedata);
config::const_child_itors range = resources::gamedata->get_variable_access_read(varname).as_array();
config::const_child_itors range = as_nonempty_range_default.child_range("_");
if(range.empty())
{
return as_nonempty_range_default.child_range("_");
}
else
{
return range;
if(resources::gamedata) {
config::const_child_itors temp_range = resources::gamedata->get_variable_access_read(varname).as_array();
if(!temp_range.empty()) {
range = temp_range;
}
}
return range;
}
}
@ -474,7 +474,9 @@ config &scoped_wml_variable::store(const config &var_value)
scoped_wml_variable::~scoped_wml_variable()
{
assert(resources::gamedata);
if(!resources::gamedata) {
return;
}
if(activated_) {
resources::gamedata->clear_variable_cfg(var_name_);