fiddlerwoaroof/crawl - Change XOD6WQOCQ7OGNEAPXXSSE6A3EUEU7MHMA2IAHUDQTSVW77RTSBBAC

Fix bug #2489023: dismiss new-game LOS monster with MF_HARD_RESET to prevent

them from dropping items rather than making them summoned, so as to avoid any "disappears in a puff of smoke" message. And to avoid anything similar in the future make the monster_die() call a silent, wizard-mode one.

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@8287 c06c8d41-db1a-0410-9941-cceddc491573

Created by zelgadis on January 6, 2009

XOD6WQOCQ7OGNEAPXXSSE6A3EUEU7MHMA2IAHUDQTSVW77RTSBBAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/stuff.cc at line 1653 [5.224557]

B:BD[3.116477] → [4.2094:2196]

B:BD[4.2196] → [2.251:306]

        // Mark as summoned so its items will also be discarded.
        mon->mark_summoned(1, true);
        monster_die(mon, KILL_DISMISSED, NON_MONSTER);

[3.116477]

[4.2241]

        // Do a hard reset so the monster's items will be discarded.
        mon->flags |= MF_HARD_RESET;
        // Do a silent, wizard-mode monster_die() just to be extra sure the
        // player sees nothings.
        monster_die(mon, KILL_DISMISSED, NON_MONSTER, true, true);