fiddlerwoaroof/crawl - Change 7CKRCWUHTQY4DVO5LXTUOIKWATEQ4YQDKDZ6UD4DLOZWS6TM7N5AC

Make summoned dancing weapons disappear in a puff of smoke rather than

giving an erroneous "drops from the air" message.

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

Created by zelgadis on June 25, 2008

7CKRCWUHTQY4DVO5LXTUOIKWATEQ4YQDKDZ6UD4DLOZWS6TM7N5AC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/monstuff.cc at line 828 [3.1396662]

B:BD[3.1408287] → [4.691:712]

        if (!silent)

[3.1408287]

[5.859]

        if (!hard_reset)
        {
            if (killer == KILL_RESET)
                killer = KILL_DISMISSED;
        }
        if (!silent && !hard_reset)

Replacement in crawl-ref/source/monstuff.cc at line 836 [3.1396662]

B:BD[5.869] → [2.2567:2596]

            if (!hard_reset)

[5.869]

[2.2596]

            int w_idx = monster->inv[MSLOT_WEAPON];
            if (w_idx != NON_ITEM && !(mitm[w_idx].flags & ISFLAG_SUMMONED))

Insertion in crawl-ref/source/monstuff.cc at line 843 [3.1396662]

[2.2664]

[5.1185]

            else
                killer = KILL_RESET;

Deletion in crawl-ref/source/monstuff.cc at line 846 [3.1396662]

B:BD[5.1195] → [5.1195:1196]

B:BD[5.1196] → [2.2665:2789]


        if (!hard_reset)
        {
            if (killer == KILL_RESET)
                killer = KILL_DISMISSED;
        }