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

Allow grouping credits with [credits_group] (except in [campaign])

Browse source 
The core game credits and localization credits are also now stored
in separate files.
This commit is contained in:
Celtic Minstrel 2017-05-22 03:11:00 -04:00
parent e741655138
commit 238d70ee22
4 changed files with 1727 additions and 1720 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
data/core/_main.cfg
View file

@ -16,7 +16,14 @@ wesnoth.dofile 'lua/feeding.lua'
#endif #endif
{core/macros/} {core/macros/}
{core/about.cfg}
[credits_group]
{core/about.cfg}
[/credits_group]
[credits_group]
{core/about_i18n.cfg}
[/credits_group]
{core/help.cfg} {core/help.cfg}
{core/hotkeys.cfg} {core/hotkeys.cfg}
#ifndef NO_TERRAIN #ifndef NO_TERRAIN

1688
data/core/about.cfg
View file

File diff suppressed because it is too large Load diff

1689
data/core/about_i18n.cfg Normal file
View file

File diff suppressed because it is too large Load diff

61
src/about.cpp
View file

@ -27,8 +27,8 @@ namespace about
{ {
static config about_list; static config about_list;
static std::map<std::string, std::string> images; static std::map<std::string, std::vector<std::string>> images;
static std::string images_default; static std::vector<std::string> images_default;
const config& get_about_config() const config& get_about_config()
{ {
@ -37,15 +37,19 @@ const config& get_about_config()
std::vector<std::string> get_background_images(const std::string& campaign) std::vector<std::string> get_background_images(const std::string& campaign)
{ {
std::vector<std::string> image_list;
if(!campaign.empty() && !images[campaign].empty()){ if(!campaign.empty() && !images[campaign].empty()){
image_list = utils::parenthetical_split(images[campaign], ','); return images[campaign];
} else{
image_list = utils::parenthetical_split(images_default, ',');
} }
return image_list; return images_default;
}
static void gather_images(const config& from, std::vector<std::string>& to)
{
const auto& im = utils::parenthetical_split(from["images"], ',');
if(!im.empty()) {
to.insert(to.end(), im.begin(), im.end());
}
} }
void set_about(const config &cfg) void set_about(const config &cfg)
@ -55,17 +59,24 @@ void set_about(const config &cfg)
images.clear(); images.clear();
images_default.clear(); images_default.clear();
for(const config& about : cfg.child_range("about")) { for(const config& group : cfg.child_range("credits_group")) {
about_list.add_child("about", about); if(!group.has_child("about")) {
continue;
const std::string& im = about["images"];
if(!im.empty()) {
if(images_default.empty()) {
images_default = im;
} else {
images_default += ',' + im;
}
} }
about_list.add_child("credits_group", group);
gather_images(group, images_default);
for(const config& about : group.child_range("about")) {
gather_images(about, images_default);
}
}
config misc;
for(const config& about : cfg.child_range("about")) {
misc.add_child("about", about);
gather_images(about, images_default);
}
if(!misc.empty()) {
about_list.add_child("credits_group", misc);
} }
for(const config& campaign : cfg.child_range("campaign")) { for(const config& campaign : cfg.child_range("campaign")) {
@ -79,23 +90,11 @@ void set_about(const config &cfg)
temp["title"] = campaign["name"]; temp["title"] = campaign["name"];
temp["id"] = id; temp["id"] = id;
std::string campaign_images;
for(const config& about : campaign.child_range("about")) { for(const config& about : campaign.child_range("about")) {
temp.add_child("about", about); temp.add_child("about", about);
gather_images(about, images[id]);
const std::string& im = about["images"];
if(!im.empty()) {
if(campaign_images.empty()) {
campaign_images = im;
} else {
campaign_images += ',' + im;
}
}
} }
images[id] = campaign_images;
about_list.add_child("credits_group", temp); about_list.add_child("credits_group", temp);
} }
} }