diff options
author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-06-26 10:39:39 +0000 |
---|---|---|
committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-06-26 10:39:39 +0000 |
commit | 61cae4a761c2f72cda44ae269c7007b37a0c14a7 (patch) | |
tree | fec8ec71ca7ca6eebd9d48881bc5ee3fe27d04c1 /crawl-ref/source/beam.cc | |
parent | d4acdf4a6a4b73607d58714a66efd372674adb56 (diff) | |
download | crawl-ref-61cae4a761c2f72cda44ae269c7007b37a0c14a7.tar.gz crawl-ref-61cae4a761c2f72cda44ae269c7007b37a0c14a7.zip |
Misc. minor cleanups. (Yes, a huge amount of them but still...)
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6146 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/beam.cc')
-rw-r--r-- | crawl-ref/source/beam.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/crawl-ref/source/beam.cc b/crawl-ref/source/beam.cc index b5eaa111f8..370b0bb7ad 100644 --- a/crawl-ref/source/beam.cc +++ b/crawl-ref/source/beam.cc @@ -1706,7 +1706,7 @@ static bool _affect_mon_in_wall(bolt &pbolt, item_def *item, int tx, int ty) int mid = mgrd[tx][ty]; if (mid == NON_MONSTER) - return false; + return (false); if (pbolt.is_enchant || (!pbolt.is_explosion && !pbolt.is_big_cloud @@ -1715,10 +1715,10 @@ static bool _affect_mon_in_wall(bolt &pbolt, item_def *item, int tx, int ty) { monsters *mon = &menv[mid]; if (!mons_is_wall_shielded(mon->type)) - return true; + return (true); } - return false; + return (false); } /* @@ -2884,15 +2884,15 @@ void mimic_alert(monsters *mimic) static bool _isBouncy(bolt &beam, unsigned char gridtype) { if (beam.name[0] == '0') - return false; + return (false); if (beam.flavour == BEAM_ELECTRICITY && gridtype != DNGN_METAL_WALL) - return true; + return (true); - if ( (beam.flavour == BEAM_FIRE || beam.flavour == BEAM_COLD) + if ((beam.flavour == BEAM_FIRE || beam.flavour == BEAM_COLD) && gridtype == DNGN_GREEN_CRYSTAL_WALL ) { - return true; + return (true); } return (false); } |