diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-02-25 14:06:58 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-02-25 14:06:58 +0000 |
| commit | 9f2bdcc6b1bc5a5ddc6a60b5edd16b22122d5901 (patch) | |
| tree | aa2e8f4a663abbf5ce3faaa7f2b5bd6bb96fe1e6 /crawl-ref | |
| parent | d3874d6e0e7a0983778c2485ecf87edfb0d25ac3 (diff) | |
| download | crawl-ref-9f2bdcc6b1bc5a5ddc6a60b5edd16b22122d5901.tar.gz crawl-ref-9f2bdcc6b1bc5a5ddc6a60b5edd16b22122d5901.zip | |
A bit of code cleanup and a randart name fix.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3463 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref')
| -rw-r--r-- | crawl-ref/source/beam.cc | 6 | ||||
| -rw-r--r-- | crawl-ref/source/direct.cc | 5 | ||||
| -rw-r--r-- | crawl-ref/source/randart.cc | 2 |
3 files changed, 7 insertions, 6 deletions
diff --git a/crawl-ref/source/beam.cc b/crawl-ref/source/beam.cc index a2c7096746..33ccaad9b6 100644 --- a/crawl-ref/source/beam.cc +++ b/crawl-ref/source/beam.cc @@ -3538,7 +3538,7 @@ static int affect_player( bolt &beam ) } // poisoning - if (beam.name.find("poison") != std::string::npos + if (beam.name.find("poisoned") != std::string::npos && beam.flavour != BEAM_POISON && beam.flavour != BEAM_POISON_ARROW && !player_res_poison()) @@ -3719,13 +3719,13 @@ static int affect_monster(bolt &beam, monsters *mon) mpr("You hear a hideous screaming!", MSGCH_SOUND); else mpr("The statue screams as its substance crumbles away!", - MSGCH_SOUND); + MSGCH_SOUND); } else { if (see_grid( mon->x, mon->y )) mpr("The statue twists and shakes as its substance " - "crumbles away!"); + "crumbles away!"); } beam.obvious_effect = true; update_hurt_or_helped(beam, mon); diff --git a/crawl-ref/source/direct.cc b/crawl-ref/source/direct.cc index b365df2de1..06af59c49f 100644 --- a/crawl-ref/source/direct.cc +++ b/crawl-ref/source/direct.cc @@ -1428,14 +1428,15 @@ static void describe_feature(int mx, int my, bool oos) if (oos && !is_terrain_seen(mx, my)) return; - std::string desc = feature_description(mx, my); + dungeon_feature_type grid = grd[mx][my]; + std::string desc = feature_description(grid); if (desc.length()) { if (oos) desc = "[" + desc + "]"; msg_channel_type channel = MSGCH_EXAMINE; - if (oos || grd[mx][my] == DNGN_FLOOR) + if (oos || grid == DNGN_FLOOR) channel = MSGCH_EXAMINE_FILTER; mpr(desc.c_str(), channel); diff --git a/crawl-ref/source/randart.cc b/crawl-ref/source/randart.cc index 4c623f19ee..ec38bcea9f 100644 --- a/crawl-ref/source/randart.cc +++ b/crawl-ref/source/randart.cc @@ -138,7 +138,7 @@ static std::string replace_name_parts(const std::string name_in, name = "of "; name += god_name(god_gift, false); name += "'s "; - name + getRandNameString("divine_esteem"); + name += getRandNameString("divine_esteem"); } name = replace_all(name, "@player_name@", you.your_name); |