summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/newgame.cc
diff options
context:
space:
mode:
authorNeil Moore <neil@s-z.org>2013-11-15 17:26:11 -0500
committerNeil Moore <neil@s-z.org>2013-11-15 17:26:11 -0500
commite7b96ffa70ca93a3cea9e2cead6f40085a6a2d68 (patch)
treeec3e4b86d3b4ed96250f735b4e597e83ee886de8 /crawl-ref/source/newgame.cc
parentb65bf4d5198c19095e3084a88983680df19ec5ee (diff)
downloadcrawl-ref-e7b96ffa70ca93a3cea9e2cead6f40085a6a2d68.tar.gz
crawl-ref-e7b96ffa70ca93a3cea9e2cead6f40085a6a2d68.zip
More formatting fixes for return (...);
Diffstat (limited to 'crawl-ref/source/newgame.cc')
-rw-r--r--crawl-ref/source/newgame.cc14
1 files changed, 7 insertions, 7 deletions
diff --git a/crawl-ref/source/newgame.cc b/crawl-ref/source/newgame.cc
index 371bb9a1f9..87de347ad6 100644
--- a/crawl-ref/source/newgame.cc
+++ b/crawl-ref/source/newgame.cc
@@ -84,14 +84,14 @@ static bool _is_random_job(job_type job)
static bool _is_random_choice(const newgame_def& choice)
{
- return (_is_random_species(choice.species)
- && _is_random_job(choice.job));
+ return _is_random_species(choice.species)
+ && _is_random_job(choice.job);
}
static bool _is_random_viable_choice(const newgame_def& choice)
{
- return (_is_random_choice(choice) &&
- (choice.job == JOB_VIABLE || choice.species == SP_VIABLE));
+ return _is_random_choice(choice) &&
+ (choice.job == JOB_VIABLE || choice.species == SP_VIABLE);
}
static bool _char_defined(const newgame_def& ng)
@@ -108,15 +108,15 @@ static string _char_description(const newgame_def& ng)
else if (_is_random_job(ng.job))
{
const string j = (ng.job == JOB_RANDOM ? "Random " : "Viable ");
- return (j + species_name(ng.species));
+ return j + species_name(ng.species);
}
else if (_is_random_species(ng.species))
{
const string s = (ng.species == SP_RANDOM ? "Random " : "Viable ");
- return (s + get_job_name(ng.job));
+ return s + get_job_name(ng.job);
}
else
- return (species_name(ng.species) + " " + get_job_name(ng.job));
+ return species_name(ng.species) + " " + get_job_name(ng.job);
}
static string _welcome(const newgame_def* ng)