diff options
| -rw-r--r-- | crawl-ref/source/beam.cc | 5 | ||||
| -rw-r--r-- | crawl-ref/source/monspeak.cc | 4 | ||||
| -rw-r--r-- | crawl-ref/source/monstuff.cc | 3 | ||||
| -rw-r--r-- | crawl-ref/source/traps.cc | 14 |
4 files changed, 13 insertions, 13 deletions
diff --git a/crawl-ref/source/beam.cc b/crawl-ref/source/beam.cc index 502b4f18f5..a8fb1dab6e 100644 --- a/crawl-ref/source/beam.cc +++ b/crawl-ref/source/beam.cc @@ -2924,7 +2924,7 @@ void bolt::drop_object() if (item->sub_type == MI_THROWING_NET) { monsters* m = monster_at(pos()); - // Player or monster on position is caught in net. + // Player or monster at position is caught in net. if (you.pos() == pos() && you.attribute[ATTR_HELD] || m && mons_is_caught(m)) { @@ -2933,7 +2933,6 @@ void bolt::drop_object() set_item_stationary(*item); } } - copy_item_to_grid(*item, pos(), 1); } } @@ -3442,7 +3441,7 @@ bool bolt::misses_player() return (false); const int dodge = player_evasion(); - int real_tohit = hit; + int real_tohit = hit; // Monsters shooting at an invisible player are very inaccurate. if (you.invisible() && !can_see_invis) diff --git a/crawl-ref/source/monspeak.cc b/crawl-ref/source/monspeak.cc index 07e284fd19..9420156c25 100644 --- a/crawl-ref/source/monspeak.cc +++ b/crawl-ref/source/monspeak.cc @@ -502,11 +502,11 @@ bool mons_speaks(monsters *monster) } #endif - const bool no_foe = foe == NULL; + const bool no_foe = (foe == NULL); const bool no_player = crawl_state.arena || (!mons_wont_attack(monster) && (!foe || foe->atype() != ACT_PLAYER)); - const bool mon_foe = m_foe != NULL; + const bool mon_foe = (m_foe != NULL); const bool no_god = no_foe || (mon_foe && foe->deity() == GOD_NO_GOD); const bool named_foe = !no_foe && (!mon_foe || (m_foe->is_named() diff --git a/crawl-ref/source/monstuff.cc b/crawl-ref/source/monstuff.cc index c0a6a6a0ec..d429a337cc 100644 --- a/crawl-ref/source/monstuff.cc +++ b/crawl-ref/source/monstuff.cc @@ -1133,7 +1133,8 @@ int monster_die(monsters *monster, killer_type killer, &summon_type); const int monster_killed = monster_index(monster); const bool hard_reset = testbits(monster->flags, MF_HARD_RESET); - const bool gives_xp = !summoned; + const bool gives_xp = (!summoned && !mons_class_flag(monster->type, + M_NO_EXP_GAIN)); const bool drop_items = !hard_reset; diff --git a/crawl-ref/source/traps.cc b/crawl-ref/source/traps.cc index 6768d44cba..a46995b4d6 100644 --- a/crawl-ref/source/traps.cc +++ b/crawl-ref/source/traps.cc @@ -175,18 +175,18 @@ bool trap_def::is_known(const actor* act) const // Returns the number of a net on a given square. -// If trapped only stationary ones are counted +// If trapped, only stationary ones are counted // otherwise the first net found is returned. int get_trapping_net(const coord_def& where, bool trapped) { for (stack_iterator si(where); si; ++si) { - if (si->base_type == OBJ_MISSILES - && si->sub_type == MI_THROWING_NET - && (!trapped || item_is_stationary(*si))) - { - return (si->index()); - } + if (si->base_type == OBJ_MISSILES + && si->sub_type == MI_THROWING_NET + && (!trapped || item_is_stationary(*si))) + { + return (si->index()); + } } return (NON_ITEM); } |