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

Changed, under the [terrain-graphics] element, the rather verbose syntax below:

Browse source 
[set_flag]
    name=blah
[/set_flag]
[set_flag]
    name=foo
[/set_flag]
[set_flag]
    name=bar
[/set_flag]

Now, it must be written:

set_flag=blah,foo,bar
This commit is contained in:
Philippe Plantier 2004-06-30 18:25:21 +00:00
parent 2509ea5506
commit aec80713f3
3 changed files with 23 additions and 110 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

68
data/terrain-graphics/adjacent.cfg
View file

@ -18,30 +18,8 @@
pos=1
type={ADJACENT}
[no_flag]
name=transition-@R0
[/no_flag]
[no_flag]
name=transition-@R1
[/no_flag]
[no_flag]
name=transition-@R2
[/no_flag]
[no_flag]
name=transition-@R3
[/no_flag]
[set_flag]
name=transition-@R0
[/set_flag]
[set_flag]
name=transition-@R1
[/set_flag]
[set_flag]
name=transition-@R2
[/set_flag]
[set_flag]
name=transition-@R3
[/set_flag]
no_flag=transition-@R0,transition-@R1,transition-@R2,transition-@R3
set_flag=transition-@R0,transition-@R1,transition-@R2,transition-@R3
[image]
z_index=-98
@ -92,24 +70,8 @@
pos=1
type={ADJACENT}
[no_flag]
name=transition-@R0
[/no_flag]
[no_flag]
name=transition-@R1
[/no_flag]
[no_flag]
name=transition-@R2
[/no_flag]
[set_flag]
name=transition-@R0
[/set_flag]
[set_flag]
name=transition-@R1
[/set_flag]
[set_flag]
name=transition-@R2
[/set_flag]
no_flag=transition-@R0,transition-@R1,transition-@R2
set_flag=transition-@R0,transition-@R1,transition-@R2
[image]
z_index=-98
@ -154,18 +116,8 @@
pos=1
type={ADJACENT}
[no_flag]
name=transition-@R0
[/no_flag]
[no_flag]
name=transition-@R1
[/no_flag]
[set_flag]
name=transition-@R0
[/set_flag]
[set_flag]
name=transition-@R1
[/set_flag]
no_flag=transition-@R0,transition-@R1
set_flag=transition-@R0,transition-@R1
[image]
z_index=-98
@ -205,12 +157,8 @@
pos=1
type={ADJACENT}
[no_flag]
name=transition-@R0
[/no_flag]
[set_flag]
name=transition-@R0
[/set_flag]
no_flag=transition-@R0
set_flag=transition-@R0
[image]
z_index=-98

50
data/terrain-graphics/castle-transitions.cfg
View file

@ -100,24 +100,9 @@
z_index=-99
name={FOREGROUND}-nw-n-ne
[/image]
[set_flag]
name=castle-transition-nw
[/set_flag]
[set_flag]
name=castle-transition-n
[/set_flag]
[set_flag]
name=castle-transition-ne
[/set_flag]
[no_flag]
name=castle-transition-nw
[/no_flag]
[no_flag]
name=castle-transition-n
[/no_flag]
[no_flag]
name=castle-transition-ne
[/no_flag]
set_flag=castle-transition-nw,castle-transition-n,castle-transition-ne
no_flag=castle-transition-nw,castle-transition-n,castle-transition-ne
[/tile]
precedence=32 # Just after terrains
[/terrain_graphics]
@ -139,18 +124,8 @@
z_index=-99
name={FOREGROUND}-nw-n
[/image]
[set_flag]
name=castle-transition-nw
[/set_flag]
[set_flag]
name=castle-transition-n
[/set_flag]
[no_flag]
name=castle-transition-nw
[/no_flag]
[no_flag]
name=castle-transition-n
[/no_flag]
set_flag=castle-transition-nw,castle-transition-n
no_flag=castle-transition-nw,castle-transition-n
[/tile]
precedence=32 # Just after terrains
[/terrain_graphics]
@ -172,18 +147,8 @@
z_index=-99
name={FOREGROUND}-n-ne
[/image]
[set_flag]
name=castle-transition-ne
[/set_flag]
[set_flag]
name=castle-transition-n
[/set_flag]
[no_flag]
name=castle-transition-ne
[/no_flag]
[no_flag]
name=castle-transition-n
[/no_flag]
set_flag=castle-transition-n,castle-transition-ne
no_flag=castle-transition-n,castle-transition-ne
[/tile]
precedence=32 # Just after terrains
[/terrain_graphics]
@ -257,3 +222,4 @@
precedence=32 # Just after terrains
[/terrain_graphics]
#enddef

15
src/builder.cpp
View file

@ -250,14 +250,13 @@ void terrain_builder::add_constraints(std::map<gamemap::location, terrain_builde
void terrain_builder::add_constraint_item(std::vector<std::string> &list, const config& cfg, const std::string &item)
{
if(!cfg[item].empty())
list.push_back(cfg[item]);
const config::child_list& items = cfg.get_children(item);
for(config::child_list::const_iterator itor = items.begin(); itor != items.end(); ++itor) {
if(!(**itor)["name"].empty())
list.push_back((**itor)["name"]);
if(!cfg[item].empty()) {
std::vector<std::string> item_string = config::split(cfg[item]);
for(std::vector<std::string>::const_iterator itor = item_string.begin();
itor != item_string.end(); ++itor) {
list.push_back(*itor);
}
}
}