Game Classification: formatting cleanup

This commit is contained in:
Charles Dang 2017-10-27 00:46:20 +11:00
parent dbf2847a44
commit e2a6979f60

View file

@ -13,10 +13,11 @@
*/
#include "game_classification.hpp"
#include "game_config.hpp"
#include "config.hpp"
#include "serialization/string_utils.hpp"
#include "game_config.hpp"
#include "log.hpp"
#include "serialization/string_utils.hpp"
static lg::log_domain log_engine("engine");
#define ERR_NG LOG_STREAM(err, log_engine)
@ -27,68 +28,70 @@ static lg::log_domain log_engine("engine");
/// The default difficulty setting for campaigns.
const std::string DEFAULT_DIFFICULTY("NORMAL");
game_classification::game_classification():
label(),
version(),
campaign_type(),
campaign_define(),
campaign_xtra_defines(),
scenario_define(),
era_define(),
mod_defines(),
campaign(),
abbrev(),
end_credits(true),
end_text(),
end_text_duration(),
difficulty(DEFAULT_DIFFICULTY),
random_mode(""),
oos_debug(false)
{}
game_classification::game_classification()
: label()
, version()
, campaign_type()
, campaign_define()
, campaign_xtra_defines()
, scenario_define()
, era_define()
, mod_defines()
, campaign()
, abbrev()
, end_credits(true)
, end_text()
, end_text_duration()
, difficulty(DEFAULT_DIFFICULTY)
, random_mode("")
, oos_debug(false)
{
}
game_classification::game_classification(const config& cfg):
label(cfg["label"]),
version(cfg["version"]),
campaign_type(cfg["campaign_type"].to_enum<game_classification::CAMPAIGN_TYPE>(game_classification::CAMPAIGN_TYPE::SCENARIO)),
campaign_define(cfg["campaign_define"]),
campaign_xtra_defines(utils::split(cfg["campaign_extra_defines"])),
scenario_define(cfg["scenario_define"]),
era_define(cfg["era_define"]),
mod_defines(utils::split(cfg["mod_defines"])),
campaign(cfg["campaign"]),
abbrev(cfg["abbrev"]),
end_credits(cfg["end_credits"].to_bool(true)),
end_text(cfg["end_text"]),
end_text_duration(cfg["end_text_duration"]),
difficulty(cfg["difficulty"].empty() ? DEFAULT_DIFFICULTY : cfg["difficulty"].str()),
random_mode(cfg["random_mode"]),
oos_debug(cfg["oos_debug"].to_bool(false))
{}
game_classification::game_classification(const config& cfg)
: label(cfg["label"])
, version(cfg["version"])
, campaign_type(
cfg["campaign_type"].to_enum<game_classification::CAMPAIGN_TYPE>(game_classification::CAMPAIGN_TYPE::SCENARIO))
, campaign_define(cfg["campaign_define"])
, campaign_xtra_defines(utils::split(cfg["campaign_extra_defines"]))
, scenario_define(cfg["scenario_define"])
, era_define(cfg["era_define"])
, mod_defines(utils::split(cfg["mod_defines"]))
, campaign(cfg["campaign"])
, abbrev(cfg["abbrev"])
, end_credits(cfg["end_credits"].to_bool(true))
, end_text(cfg["end_text"])
, end_text_duration(cfg["end_text_duration"])
, difficulty(cfg["difficulty"].empty() ? DEFAULT_DIFFICULTY : cfg["difficulty"].str())
, random_mode(cfg["random_mode"])
, oos_debug(cfg["oos_debug"].to_bool(false))
{
}
game_classification::game_classification(const game_classification& gc):
label(gc.label),
version(gc.version),
campaign_type(gc.campaign_type),
campaign_define(gc.campaign_define),
campaign_xtra_defines(gc.campaign_xtra_defines),
scenario_define(gc.scenario_define),
era_define(gc.era_define),
mod_defines(gc.mod_defines),
campaign(gc.campaign),
abbrev(gc.abbrev),
end_credits(gc.end_credits),
end_text(gc.end_text),
end_text_duration(gc.end_text_duration),
difficulty(gc.difficulty),
random_mode(gc.random_mode),
oos_debug(gc.oos_debug)
game_classification::game_classification(const game_classification& gc)
: label(gc.label)
, version(gc.version)
, campaign_type(gc.campaign_type)
, campaign_define(gc.campaign_define)
, campaign_xtra_defines(gc.campaign_xtra_defines)
, scenario_define(gc.scenario_define)
, era_define(gc.era_define)
, mod_defines(gc.mod_defines)
, campaign(gc.campaign)
, abbrev(gc.abbrev)
, end_credits(gc.end_credits)
, end_text(gc.end_text)
, end_text_duration(gc.end_text_duration)
, difficulty(gc.difficulty)
, random_mode(gc.random_mode)
, oos_debug(gc.oos_debug)
{
}
config game_classification::to_config() const
{
config cfg;
cfg["label"] = label;
cfg["version"] = game_config::version;
cfg["campaign_type"] = campaign_type.to_string();
@ -105,6 +108,7 @@ config game_classification::to_config() const
cfg["difficulty"] = difficulty;
cfg["random_mode"] = random_mode;
cfg["oos_debug"] = oos_debug;
return cfg;
}
@ -113,9 +117,8 @@ std::string game_classification::get_tagname() const
if(this->campaign_type == CAMPAIGN_TYPE::MULTIPLAYER) {
return this->campaign.empty() ? "multiplayer" : "scenario";
}
else {
return this->campaign_type.to_string();
}
return this->campaign_type.to_string();
}
bool game_classification::is_normal_mp_game() const