diff options
author | ennewalker <ennewalker@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-04-18 15:08:40 +0000 |
---|---|---|
committer | ennewalker <ennewalker@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-04-18 15:08:40 +0000 |
commit | 4f56baa35df811304ef3e45c83471fcfd43bce2c (patch) | |
tree | 32443c8d02e82c16a5e8f1153e3ce194e9b8f02b /crawl-ref/source/dungeon.cc | |
parent | 92a70a7bda3d5a52fd6cc016b748e6bf59fb81e4 (diff) | |
download | crawl-ref-4f56baa35df811304ef3e45c83471fcfd43bce2c.tar.gz crawl-ref-4f56baa35df811304ef3e45c83471fcfd43bce2c.zip |
[2758242] Fixing segfault during debug_mons_scan due to an mprf not matching its format string with its var args. Also, fixing clone function from chaos brand that was causing this where cloned items in monster inventories weren't setting their link to be part of the new monster's inventory. Refactoring monster holding functions into item_def, where they probably should be.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@9618 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/dungeon.cc')
-rw-r--r-- | crawl-ref/source/dungeon.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crawl-ref/source/dungeon.cc b/crawl-ref/source/dungeon.cc index e5b51ee0cf..3930a08826 100644 --- a/crawl-ref/source/dungeon.cc +++ b/crawl-ref/source/dungeon.cc @@ -1089,7 +1089,7 @@ static void _fixup_misplaced_items() { item_def& item(mitm[i]); if (!is_valid_item(item) || (item.pos.x == 0) - || held_by_monster(item)) + || item.held_by_monster()) { continue; } |