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

Synced addon_type_strings wih the enumeration, missing initializers.

Browse source
This commit is contained in:
fendrin 2014-05-10 02:25:42 +02:00
parent 8795334ddc
commit 00954d4c76
4 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/addon/info.cpp
View file

@ -72,7 +72,6 @@ void addon_info::read(const config& cfg)
this->downloads = cfg["downloads"];
this->uploads = cfg["uploads"];
this->type = get_addon_type(cfg["type"].str());
this->core = cfg["core"].str();
const config::const_child_itors& locales = cfg.child_range("translation");
@ -80,6 +79,7 @@ void addon_info::read(const config& cfg)
this->locales.push_back(locale["language"].str());
}
this->core = cfg["core"].str();
this->depends = utils::split(cfg["dependencies"].str());
this->feedback_url = cfg["feedback_url"].str();
@ -99,12 +99,12 @@ void addon_info::write(config& cfg) const
cfg["downloads"] = this->downloads;
cfg["uploads"] = this->uploads;
cfg["type"] = get_addon_type_string(this->type);
cfg["core"] = this->core;
BOOST_FOREACH(const std::string& locale_id, this->locales) {
cfg.add_child("translation")["language"] = locale_id;
}
cfg["core"] = this->core;
cfg["dependencies"] = utils::join(this->depends);
cfg["feedback_url"] = this->feedback_url;

3
src/addon/info.hpp
View file

@ -64,6 +64,7 @@ struct addon_info
: id(), title(), description(), icon()
, version(), author(), size(), downloads()
, uploads(), type(), locales()
, core()
, depends()
, feedback_url()
, updated()
@ -75,6 +76,7 @@ struct addon_info
: id(), title(), description(), icon()
, version(), author(), size(), downloads()
, uploads(), type(), locales()
, core()
, depends()
, feedback_url()
, updated()
@ -97,6 +99,7 @@ struct addon_info
this->uploads = o.uploads;
this->type = o.type;
this->locales = o.locales;
this->core = o.core;
this->depends = o.depends;
this->feedback_url = o.feedback_url;
this->updated = o.updated;

2
src/addon/validation.cpp
View file

@ -23,7 +23,7 @@ const unsigned short default_campaignd_port = 15007;
namespace {
const std::string addon_type_strings[] = {
"unknown", "campaign", "scenario", "campaign_sp_mp", "campaign_mp", "core",
"unknown", "core", "campaign", "scenario", "campaign_sp_mp", "campaign_mp",
"scenario_mp", "map_pack", "era", "faction", "mod_mp", /*"gui", */ "media",
"other", ""
};

2
src/addon/validation.hpp
View file

@ -40,6 +40,7 @@ extern const unsigned short default_campaignd_port;
*/
enum ADDON_TYPE {
ADDON_UNKNOWN, /**< a.k.a. anything. */
ADDON_CORE, /**< Total Conversion Core. */
ADDON_SP_CAMPAIGN, /**< Single-player campaign. */
ADDON_SP_SCENARIO, /**< Single-player scenario. */
ADDON_SP_MP_CAMPAIGN, /**< Hybrid campaign. */
@ -48,7 +49,6 @@ enum ADDON_TYPE {
ADDON_MP_MAPS, /**< Multiplayer plain (no WML) map pack. */
ADDON_MP_ERA, /**< Multiplayer era. */
ADDON_MP_FACTION, /**< Multiplayer faction. */
ADDON_CORE, /**< Total Conversion Core. */
// NOTE: following two still require proper engine support
ADDON_MP_MOD, /**< Modification of the game for MP. */
//ADDON_GUI, // GUI add-ons/themes.