diff options
| author | David Lawrence Ramsey <dolorous@users.sourceforge.net> | 2009-11-21 12:37:25 -0600 |
|---|---|---|
| committer | David Lawrence Ramsey <dolorous@users.sourceforge.net> | 2009-11-21 12:37:25 -0600 |
| commit | 4277eaea5e02fb69d64193a0395357e2c346afdb (patch) | |
| tree | 68806b639fbb4d2e08215b12517c86c2eee0fe94 /crawl-ref/source/kills.cc | |
| parent | 505571294e7ca02c0af89ff2b25f3cecde439448 (diff) | |
| download | crawl-ref-4277eaea5e02fb69d64193a0395357e2c346afdb.tar.gz crawl-ref-4277eaea5e02fb69d64193a0395357e2c346afdb.zip | |
Add formatting fixes.
This mostly puts && and || on the proper lines, per the style guide.
Diffstat (limited to 'crawl-ref/source/kills.cc')
| -rw-r--r-- | crawl-ref/source/kills.cc | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/crawl-ref/source/kills.cc b/crawl-ref/source/kills.cc index 6857c3d82c..fa7e0a3924 100644 --- a/crawl-ref/source/kills.cc +++ b/crawl-ref/source/kills.cc @@ -80,8 +80,8 @@ void KillMaster::load(reader& inf) { unsigned char major = unmarshallByte(inf), minor = unmarshallByte(inf); - if (major != KILLS_MAJOR_VERSION || - (minor != KILLS_MINOR_VERSION && minor > 0)) + if (major != KILLS_MAJOR_VERSION + || (minor != KILLS_MINOR_VERSION && minor > 0)) { return; } @@ -543,16 +543,18 @@ std::string kill_def::info(const kill_monster_desc &md) const if (!mons_is_unique(md.monnum)) { - // Pluralise as needed + // Pluralise as needed. name = n_names(name, kills); - // We brand shapeshifters with the (shapeshifter) qualifier. This - // has to be done after doing pluralise(), else we get very odd plurals - // :) - if (md.modifier == kill_monster_desc::M_SHAPESHIFTER && - md.monnum != MONS_SHAPESHIFTER && - md.monnum != MONS_GLOWING_SHAPESHIFTER) + // We brand shapeshifters with the (shapeshifter) qualifier. + // This has to be done after doing pluralise(), else we get very + // odd plurals :) + if (md.modifier == kill_monster_desc::M_SHAPESHIFTER + && md.monnum != MONS_SHAPESHIFTER + && md.monnum != MONS_GLOWING_SHAPESHIFTER) + { name += " (shapeshifter)"; + } } else if (kills > 1) { @@ -716,11 +718,11 @@ KILLEXP_ACCESS(base_name, string, base_name.c_str()) KILLEXP_ACCESS(desc, string, desc.c_str()) KILLEXP_ACCESS(monnum, number, monnum) KILLEXP_ACCESS(isghost, boolean, - monnum == -1 && - ke->desc.find("The ghost of") != std::string::npos) + monnum == -1 + && ke->desc.find("The ghost of") != std::string::npos) KILLEXP_ACCESS(ispandemon, boolean, - monnum == -1 && - ke->desc.find("The ghost of") == std::string::npos) + monnum == -1 + && ke->desc.find("The ghost of") == std::string::npos) KILLEXP_ACCESS(isunique, boolean, monnum != -1 && mons_is_unique(ke->monnum)) |