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/player.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/player.cc')
| -rw-r--r-- | crawl-ref/source/player.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/crawl-ref/source/player.cc b/crawl-ref/source/player.cc index 73ba895c38..f914de5720 100644 --- a/crawl-ref/source/player.cc +++ b/crawl-ref/source/player.cc @@ -852,8 +852,7 @@ int player_equip( equipment_type slot, int sub_type, bool calc_unid ) default: if (you.equip[slot] != -1 && you.inv[you.equip[slot]].sub_type == sub_type - && (calc_unid || - item_type_known(you.inv[you.equip[slot]]))) + && (calc_unid || item_type_known(you.inv[you.equip[slot]]))) { ret++; } @@ -6885,8 +6884,10 @@ bool player::visible_to(const actor *looker) const return (can_see_invisible() || !invisible()); const monsters* mon = dynamic_cast<const monsters*>(looker); - return (!this->invisible() || this->in_water() || - mon->can_see_invisible() || mons_sense_invis(mon)); + return (!invisible() + || in_water() + || mon->can_see_invisible() + || mons_sense_invis(mon)); } bool player::backlit(bool check_haloed) const |