diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-06-02 12:31:12 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-06-02 12:31:12 +0000 |
| commit | b50eafe8de72cbcc4431813934695c22642cdd46 (patch) | |
| tree | 393c748e0cffac935a3ca89114e3444a2795ca7f /crawl-ref/source/monstuff.cc | |
| parent | c78ed8ca5a6f1528db2bfe1f846e24bef6695a89 (diff) | |
| download | crawl-ref-b50eafe8de72cbcc4431813934695c22642cdd46.tar.gz crawl-ref-b50eafe8de72cbcc4431813934695c22642cdd46.zip | |
I'm not sure I actually coded anything worthwhile, though I experimented
a fair bit and as usually ended up doing lots of clean-up.
Oh wait, I modified eat_from_floor prompts to only force a more if there
was actually a message before trying the inventory (whoops), and also
modified the corpses in pack hint to take into account that a saccing
player won't be interested in butchering rotten corpses.
Also implemented a modified FR 1981119: when Detect Creatures only
detects plants already seen before, print a different message
("You detect no further creatures.").
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5435 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/monstuff.cc')
| -rw-r--r-- | crawl-ref/source/monstuff.cc | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/crawl-ref/source/monstuff.cc b/crawl-ref/source/monstuff.cc index d79233cc63..0ac59d48c6 100644 --- a/crawl-ref/source/monstuff.cc +++ b/crawl-ref/source/monstuff.cc @@ -882,12 +882,10 @@ void monster_die(monsters *monster, killer_type killer, int i, bool silent) case KILL_YOU_MISSILE: // You kill by missile or beam. case KILL_YOU_CONF: // You kill by confusion. { - const bool bad_kill = - god_hates_killing(you.religion, monster); + const bool bad_kill = god_hates_killing(you.religion, monster); + const bool was_neutral = testbits(monster->flags, MF_WAS_NEUTRAL); const bool created_friendly = testbits(monster->flags, MF_CREATED_FRIENDLY); - const bool was_neutral = - testbits(monster->flags, MF_WAS_NEUTRAL); if (death_message) { @@ -1600,11 +1598,11 @@ bool monster_polymorph( monsters *monster, monster_type targetc, monster->base_monster = MONS_PROGRAM_BUG; monster->number = 0; - mon_enchant abj = monster->get_ench(ENCH_ABJ); - mon_enchant charm = monster->get_ench(ENCH_CHARM); - mon_enchant neutral = monster->get_ench(ENCH_NEUTRAL); - mon_enchant shifter = monster->get_ench(ENCH_GLOWING_SHAPESHIFTER, - ENCH_SHAPESHIFTER); + mon_enchant abj = monster->get_ench(ENCH_ABJ); + mon_enchant charm = monster->get_ench(ENCH_CHARM); + mon_enchant neutral = monster->get_ench(ENCH_NEUTRAL); + mon_enchant shifter = monster->get_ench(ENCH_GLOWING_SHAPESHIFTER, + ENCH_SHAPESHIFTER); // Note: define_monster() will clear out all enchantments! -- bwr define_monster( monster_index(monster) ); @@ -2061,7 +2059,7 @@ void behaviour_event( monsters *mon, int event, int src, || ((wontAttack != sourceWontAttack || isSmart) && mon->behaviour != BEH_FLEE && mon->behaviour != BEH_PANIC)) { - // (plain) plants and fungi cannot flee or fight back + // (Plain) plants and fungi cannot flee or fight back. if (mon->type == MONS_FUNGUS || mon->type == MONS_PLANT) return; |