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/player-act.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/player-act.cc')
| -rw-r--r-- | crawl-ref/source/player-act.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/crawl-ref/source/player-act.cc b/crawl-ref/source/player-act.cc index e5e76e050a..364f3ea74a 100644 --- a/crawl-ref/source/player-act.cc +++ b/crawl-ref/source/player-act.cc @@ -135,12 +135,12 @@ bool player::floundering() const bool player::extra_balanced() const { const dungeon_feature_type grid = grd(pos()); - return (species == SP_GREY_DRACONIAN - || grid == DNGN_SHALLOW_WATER - && (species == SP_NAGA // tails, not feet - || body_size(PSIZE_BODY) >= SIZE_LARGE) - && (form == TRAN_LICH || form == TRAN_STATUE - || !form_changed_physiology())); + return species == SP_GREY_DRACONIAN + || grid == DNGN_SHALLOW_WATER + && (species == SP_NAGA // tails, not feet + || body_size(PSIZE_BODY) >= SIZE_LARGE) + && (form == TRAN_LICH || form == TRAN_STATUE + || !form_changed_physiology()); } int player::get_experience_level() const @@ -277,7 +277,7 @@ item_def *player::slot_item(equipment_type eq, bool include_melded) const const int item = equip[eq]; if (item == -1 || !include_melded && melded[eq]) return NULL; - return (const_cast<item_def *>(&inv[item])); + return const_cast<item_def *>(&inv[item]); } // Returns the item in the player's weapon slot. |