diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-05-20 07:24:17 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-05-20 07:24:17 +0000 |
| commit | 1733067254ea91e95f1e77015ec3fd71c6424186 (patch) | |
| tree | 234270c1688a19b998f67349a1661d4c135b1df3 /crawl-ref/source/misc.cc | |
| parent | 75ffb38b0b37ff9e70d4bedf1607ba7e637fba48 (diff) | |
| download | crawl-ref-1733067254ea91e95f1e77015ec3fd71c6424186.tar.gz crawl-ref-1733067254ea91e95f1e77015ec3fd71c6424186.zip | |
Rename static methods in travel.cc and terrain.cc.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5146 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/misc.cc')
| -rw-r--r-- | crawl-ref/source/misc.cc | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/crawl-ref/source/misc.cc b/crawl-ref/source/misc.cc index d5d3916265..31c4cbd86a 100644 --- a/crawl-ref/source/misc.cc +++ b/crawl-ref/source/misc.cc @@ -2531,7 +2531,7 @@ bool is_damaging_cloud(cloud_type type, bool temp) case CLOUD_FIRE: case CLOUD_COLD: return (true); - // only harmful if the player doesn't have the necessary resistances + // Only harmful if the player doesn't have the necessary resistances. // Takes into account what the player can *know* and what s/he can // also expect to be the case a few turns later (ignores spells). case CLOUD_STINK: @@ -2584,10 +2584,11 @@ bool mons_is_safe(const struct monsters *mon, bool want_move) || mons_class_flag(mon->type, M_NO_EXP_GAIN); #ifdef CLUA_BINDINGS - bool moving = ((!you.delay_queue.empty() + bool moving = (!you.delay_queue.empty() && is_run_delay(you.delay_queue.front().type) - && you.delay_queue.front().type != DELAY_REST) - || you.running < RMODE_NOT_RUNNING || want_move); + && you.delay_queue.front().type != DELAY_REST + || you.running < RMODE_NOT_RUNNING + || want_move); int dist = grid_distance(you.x_pos, you.y_pos, mon->x, mon->y); @@ -2695,7 +2696,7 @@ bool i_feel_safe(bool announce, bool want_move, bool just_monsters, int range) if (announce) { std::string monname = - (mons_is_mimic(m.type)) ? "the mimic" : m.name(DESC_NOCAP_A); + (mons_is_mimic(m.type)) ? "a mimic" : m.name(DESC_NOCAP_A); mprf(MSGCH_WARN, "Not with %s in view!", monname.c_str()); } |