diff options
| author | Neil Moore <neil@s-z.org> | 2013-11-15 17:26:11 -0500 |
|---|---|---|
| committer | Neil Moore <neil@s-z.org> | 2013-11-15 17:26:11 -0500 |
| commit | e7b96ffa70ca93a3cea9e2cead6f40085a6a2d68 (patch) | |
| tree | ec3e4b86d3b4ed96250f735b4e597e83ee886de8 /crawl-ref/source/spl-util.cc | |
| parent | b65bf4d5198c19095e3084a88983680df19ec5ee (diff) | |
| download | crawl-ref-e7b96ffa70ca93a3cea9e2cead6f40085a6a2d68.tar.gz crawl-ref-e7b96ffa70ca93a3cea9e2cead6f40085a6a2d68.zip | |
More formatting fixes for return (...);
Diffstat (limited to 'crawl-ref/source/spl-util.cc')
| -rw-r--r-- | crawl-ref/source/spl-util.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crawl-ref/source/spl-util.cc b/crawl-ref/source/spl-util.cc index 7c3ec3f292..a8b206cb94 100644 --- a/crawl-ref/source/spl-util.cc +++ b/crawl-ref/source/spl-util.cc @@ -257,7 +257,7 @@ spell_type get_spell_by_letter(char letter) const int slot = get_spell_slot_by_letter(letter); - return ((slot == -1) ? SPELL_NO_SPELL : you.spells[slot]); + return (slot == -1) ? SPELL_NO_SPELL : you.spells[slot]; } bool add_spell_to_memory(spell_type spell) @@ -504,8 +504,8 @@ bool disciplines_conflict(unsigned int disc1, unsigned int disc2) { const unsigned int combined = disc1 | disc2; - return ((combined & SPTYP_EARTH) && (combined & SPTYP_AIR) - || (combined & SPTYP_FIRE) && (combined & SPTYP_ICE)); + return (combined & SPTYP_EARTH) && (combined & SPTYP_AIR) + || (combined & SPTYP_FIRE) && (combined & SPTYP_ICE); } const char *spell_title(spell_type spell) |