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

reverse the "core" terrain logic so UMC can pull core terrains...

Browse source 
...into an UMC terrain group without making the terrain non-core
This commit is contained in:
Tomasz Śniatowski 2009-08-15 23:33:51 +01:00
parent 7ec4ad9946
commit 9f60ee8302
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/editor/editor_palettes.cpp
View file

@ -104,18 +104,18 @@ terrain_palette::terrain_palette(display &gui, const size_specs &sizes,
// add the terrain to the requested groups
const std::vector<std::string>& keys = utils::split(t_info.editor_group());
bool core = true;
bool core = false;
foreach (const std::string& k, keys) {
terrain_map_[k].push_back(t);
std::map<std::string, terrain_group*>::iterator i = id_to_group.find(k);
if (i != id_to_group.end()) {
if (!i->second->core) {
core = false;
if (i->second->core) {
core = true;
}
}
}
// A terrain is considered core iff it does not appear in any
// non-core terrain group
// A terrain is considered core iff it appears in at least
// one core terrain group
if (core) {
// Add the terrain to the default group
terrain_map_["all"].push_back(t);