diff options
| author | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-10-08 14:06:54 +0000 |
|---|---|---|
| committer | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-10-08 14:06:54 +0000 |
| commit | d4ea2a59a8866122e63047d3967b9fc3b7a3ddef (patch) | |
| tree | faef1aa4ec3388bbc7cdcfd754b10cd56505d6d2 | |
| parent | c7ab36b8b51c2fa925fd5245d31e5f98cfa466e0 (diff) | |
| download | crawl-ref-d4ea2a59a8866122e63047d3967b9fc3b7a3ddef.tar.gz crawl-ref-d4ea2a59a8866122e63047d3967b9fc3b7a3ddef.zip | |
s/cannot_move/cannot_act/ for clarity.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@2378 c06c8d41-db1a-0410-9941-cceddc491573
| -rw-r--r-- | crawl-ref/source/acr.cc | 8 | ||||
| -rw-r--r-- | crawl-ref/source/externs.h | 2 | ||||
| -rw-r--r-- | crawl-ref/source/player.cc | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/crawl-ref/source/acr.cc b/crawl-ref/source/acr.cc index 7385ce5c68..9cbae70618 100644 --- a/crawl-ref/source/acr.cc +++ b/crawl-ref/source/acr.cc @@ -1276,7 +1276,7 @@ static void input() learned_something_new(TUT_RETREAT_CASTER); } - if ( you.cannot_move() ) + if ( you.cannot_act() ) { crawl_state.cancel_cmd_repeat("Cannot move, cancelling command " "repetition."); @@ -2694,7 +2694,7 @@ static void world_reacts() run_environment_effects(); - if ( !you.cannot_move() && !you.mutation[MUT_BLURRY_VISION] && + if ( !you.cannot_act() && !you.mutation[MUT_BLURRY_VISION] && (you.mutation[MUT_ACUTE_VISION] >= 2 || random2(50) < you.skills[SK_TRAPS_DOORS]) ) { @@ -2798,7 +2798,7 @@ static void world_reacts() // food death check: if (you.is_undead != US_UNDEAD && you.hunger <= 500) { - if (!you.cannot_move() && one_chance_in(40)) + if (!you.cannot_act() && one_chance_in(40)) { mpr("You lose consciousness!", MSGCH_FOOD); you.duration[DUR_PARALYSIS] += 5 + random2(8); @@ -2839,7 +2839,7 @@ static void world_reacts() */ viewwindow(true, false); - if (you.cannot_move() && any_messages()) + if (you.cannot_act() && any_messages()) more(); spawn_random_monsters(); diff --git a/crawl-ref/source/externs.h b/crawl-ref/source/externs.h index e3027c9587..194e9dba55 100644 --- a/crawl-ref/source/externs.h +++ b/crawl-ref/source/externs.h @@ -809,7 +809,7 @@ public: void awake(); void check_awaken(int disturbance); - bool cannot_move() const; + bool cannot_act() const; int armour_class() const; int melee_evasion(const actor *attacker) const; diff --git a/crawl-ref/source/player.cc b/crawl-ref/source/player.cc index 9e74b1628d..6b9a0f7158 100644 --- a/crawl-ref/source/player.cc +++ b/crawl-ref/source/player.cc @@ -6078,7 +6078,7 @@ bool player::asleep() const return duration[DUR_SLEEP] > 0; } -bool player::cannot_move() const +bool player::cannot_act() const { return (asleep() || paralysed()); } |