diff options
author | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-07-02 02:07:37 +0000 |
---|---|---|
committer | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-07-02 02:07:37 +0000 |
commit | 71ad92da616950e6a90a9bf5bc7aeb28dc13ebbb (patch) | |
tree | d35440d2473ec1dd80346bdb5b407123fee9782f /crawl-ref/source/fight.cc | |
parent | d7a2cf15999e24bc215063179a8686873d630ded (diff) | |
download | crawl-ref-71ad92da616950e6a90a9bf5bc7aeb28dc13ebbb.tar.gz crawl-ref-71ad92da616950e6a90a9bf5bc7aeb28dc13ebbb.zip |
Add more miscellaneous minor fixes.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6314 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/fight.cc')
-rw-r--r-- | crawl-ref/source/fight.cc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/crawl-ref/source/fight.cc b/crawl-ref/source/fight.cc index e59d750fda..d2d9698d88 100644 --- a/crawl-ref/source/fight.cc +++ b/crawl-ref/source/fight.cc @@ -3125,8 +3125,8 @@ bool melee_attack::mons_attack_mons() || is_sanctuary(def_pos.x, def_pos.y)) && atk != def) { - // Friendly monsters should only violate sanctuary if - // explictly ordered to do so by the player. + // Friendly monsters should only violate sanctuary if explicitly + // ordered to do so by the player. if (mons_friendly(atk)) { if (you.pet_target == MHITYOU || you.pet_target == MHITNOT) @@ -3159,9 +3159,9 @@ bool melee_attack::mons_attack_mons() behaviour_event(def, ME_WHACK, monster_index(atk)); } - // If an enemy attacked a friend, set the pet target if it isn't - // set already, but not if Sanctuary is in effect (pet target must - // be set explicitly by the player during Sanctuary) + // If an enemy attacked a friend, set the pet target if it isn't set + // already, but not if sanctuary is in effect (pet target must be + // set explicitly by the player during sanctuary). if (perceived_attack && atk->alive() && mons_friendly(def) && !mons_wont_attack(atk) && you.pet_target == MHITNOT && env.sanctuary_time <= 0) @@ -4005,9 +4005,9 @@ void melee_attack::mons_check_attack_perceived() { interrupt_activity(AI_MONSTER_ATTACKS, atk); - // If a friend wants to help, they can attack the attacking monster, - // unless Sanctuary is in effect since pet target can only be - // changed explicitly by the player during sanctuary. + // If a friend wants to help, they can attack the attacking + // monster, unless sanctuary is in effect since pet_target can + // only be changed explicitly by the player during sanctuary. if (you.pet_target == MHITNOT && env.sanctuary_time <= 0) you.pet_target = monster_index(atk); } |