fiddlerwoaroof/crawl - Change DUTBRTI4FY2QGH6CX3U2PFUA4NEGJSGR52SVVIDGMGR6QSA3KQXQC

Fix bug #2482254: a giant spore exploding was having the mgrd where it used to

be set to NON_MONSTER twice, the second time after the royal jelly had responded to the explosion and spat out a new jelly on the spot the spore used to occupy, leading to the new jelly becoming detached from the mgrd.

Allowing the royal jelly to be radnomly generated in the arena with the random_uniques tag, since it's no longer causing a crash.

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

Created by zelgadis on January 18, 2009

DUTBRTI4FY2QGH6CX3U2PFUA4NEGJSGR52SVVIDGMGR6QSA3KQXQC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/monstuff.cc at line 959 [5.1396662]

[3.4877]

[4.2919]


    // The explosion might cause a monster to be placed where the spore
    // used to be, so make sure that mgrd() doesn't get cleared a second
    // time (causing the new monster to become floating) when
    // monster->reset() is called.
    monster->pos().reset();

Deletion in crawl-ref/source/arena.cc at line 866 [7.10815]

B:BD[6.3739] → [2.3000:3131]

∅:D[2.3131] → [6.3870:3936]

B:BD[6.3870] → [6.3870:3936]

            // Skip the royal jelly for now, since if it gets hit by
            // multiple explosions it can cause an assertion.
            if (i == MONS_ROYAL_JELLY)
                continue;