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

New key 'set_no_flag' in [tile] which combines 'set_flag' and 'no_flag'...

Browse source 
...because most of the times we use same flags in both keys.
This will also reduce the macro use in terrain_graphics.
This commit is contained in:
Ali El Gariani 2010-07-24 02:24:20 +00:00
parent daf8bcdf82
commit 3815cfe628
1 changed files with 15 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/builder.cpp
View file

@ -652,6 +652,13 @@ void terrain_builder::add_constraints(terrain_builder::constraint_set &constrain
constraint.no_flag.insert(constraint.no_flag.end(),
item_string.begin(), item_string.end());
item_string = utils::split(cfg["set_no_flag"]);
constraint.set_flag.insert(constraint.set_flag.end(),
item_string.begin(), item_string.end());
constraint.no_flag.insert(constraint.no_flag.end(),
item_string.begin(), item_string.end());
add_images_from_config(constraint.images, cfg, false);
}
@ -791,6 +798,7 @@ void terrain_builder::parse_config(const config &cfg, bool local)
const std::vector<std::string> global_set_flag = utils::split(br["set_flag"]);
const std::vector<std::string> global_no_flag = utils::split(br["no_flag"]);
const std::vector<std::string> global_has_flag = utils::split(br["has_flag"]);
const std::vector<std::string> global_set_no_flag = utils::split(br["set_no_flag"]);
for(constraint_set::iterator constraint = pbr.constraints.begin(); constraint != pbr.constraints.end();
++constraint) {
@ -807,6 +815,13 @@ void terrain_builder::parse_config(const config &cfg, bool local)
constraint->second.has_flag.insert(constraint->second.has_flag.end(),
global_has_flag.begin(), global_has_flag.end());
if(!global_set_no_flag.empty()) {
constraint->second.set_flag.insert(constraint->second.set_flag.end(),
global_set_no_flag.begin(), global_set_no_flag.end());
constraint->second.no_flag.insert(constraint->second.no_flag.end(),
global_set_no_flag.begin(), global_set_no_flag.end());
}
}
// Handles rotations