fiddlerwoaroof/crawl - Change 5G724WYHCSV474ZLORSLGN35R6OHTTLUPT3XLB4CXA5AXTBS6MUQC

Dancing weapons fix for trunk.

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

Created by haranp on February 12, 2009

5G724WYHCSV474ZLORSLGN35R6OHTTLUPT3XLB4CXA5AXTBS6MUQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/spells2.cc at line 1705 [5.569242]

B:BD[3.649] → [3.649:720]

        // by get_item_slot() when giving the dancing weapon it's item

[3.649]

[3.720]

        // by get_item_slot() when giving the dancing weapon its item

Replacement in crawl-ref/source/monplace.cc at line 1118 [5.1641732]
B:BD[5.1656511] → [6.30401:30479]
```
    if (mg.cls == MONS_DANCING_WEAPON && mg.number != 1) // ie not from spell
```
[5.1656511]
[5.1656587]
```
    if (mg.cls == MONS_DANCING_WEAPON)
```

Replacement in crawl-ref/source/monplace.cc at line 1122 [5.1641732]

B:BD[5.1656626] → [5.1656626:1656678]

B:BD[5.1656678] → [7.3064:3135]

        if (menv[id].inv[MSLOT_WEAPON] != NON_ITEM)
            menv[id].colour = mitm[menv[id].inv[MSLOT_WEAPON]].colour;

[5.1656626]

[5.1656751]

        // Dancing swords *always* have a weapon. Fail to
        // create them otherwise.
        const item_def* wpn = menv[id].weapon();
        if (!wpn)
        {
            menv[id].destroy_inventory();
            menv[id].reset();
            return (-1);
        }
        else
        {
            menv[id].colour = wpn->colour;
        }

Replacement in crawl-ref/source/mon-util.cc at line 2003 [5.1699344]
∅:D[2.2845] → [8.6504:6557]
B:BD[8.6504] → [8.6504:6557]
```
        item_def item = mitm[mon.inv[MSLOT_WEAPON]];
```
[2.2845]
[2.2846]
```
        const item_def& item = mitm[mon.inv[MSLOT_WEAPON]];
```

Replacement in crawl-ref/source/decks.cc at line 2648 [5.3987460]

B:BD[9.850] → [10.61321:61380]

            if (monster->type == -1 || !mons_near(monster)

[9.850]

[10.61380]

            if (!monster->alive()
                || !mons_near(monster)

Replacement in crawl-ref/source/decks.cc at line 2703 [5.3987460]

B:BD[11.10119] → [6.51848:51868]

B:BD[6.51868] → [12.2846:2901]

B:BD[12.2901] → [13.10860:10906]

B:BD[13.10906] → [4.4727:4767]

    create_monster(
        mgen_data(summon_any_demon(dct), BEH_FRIENDLY,
                  std::min(power / 50, 6), 0,
                  you.pos(), MHITYOU));

[11.10119]

[14.1958]

    // FIXME: The manual testing for message printing is there because
    // we can't rely on create_monster() to do it for us. This is
    // because if you are completely surrounded by walls, create_monster()
    // will never manage to give a position which isn't (-1,-1)
    // and thus not print the message.
    // This hack appears later in this file as well.
    if (create_monster(
            mgen_data(summon_any_demon(dct), BEH_FRIENDLY,
                      std::min(power / 50, 6), 0,
                      you.pos(), MHITYOU),
            false) == -1)
    {
        mpr("You see a puff of smoke.");
    }

Replacement in crawl-ref/source/decks.cc at line 2765 [5.3987460]

B:BD[15.2895] → [6.52018:52038]

B:BD[6.52038] → [12.2992:3079]

B:BD[12.3079] → [13.10907:10962]

B:BD[13.10962] → [4.4768:4797]

    create_monster(
        mgen_data(mon_chosen,
                  friendly ? BEH_FRIENDLY : BEH_HOSTILE,
                  3, 0,
                  chosen_spot,
                  MHITYOU));

[15.2895]

[16.7369]

    if (create_monster(mgen_data(mon_chosen,
                                 friendly ? BEH_FRIENDLY : BEH_HOSTILE,
                                 3, 0, chosen_spot, MHITYOU),
                       false) == -1)
    {
        mpr("You see a puff of smoke.");
    }

Replacement in crawl-ref/source/decks.cc at line 2783 [5.3987460]

B:BD[12.3286] → [4.4798:4862]

                      power_level + 3, 0, you.pos(), MHITYOU));

[12.3286]

[11.10124]

                      power_level + 3, 0, you.pos(), MHITYOU),
            false);

Insertion in crawl-ref/source/decks.cc at line 2830 [5.3987460]

[17.1647]

[18.601]

    else
    {
        mpr("You see a puff of smoke.");
    }

Replacement in crawl-ref/source/decks.cc at line 2872 [5.3987460]

B:BD[18.916] → [6.52679:52718]

B:BD[6.52718] → [19.11563:11599]

∅:D[19.11599] → [6.52755:52806]

B:BD[6.52755] → [6.52755:52806]

B:BD[6.52806] → [13.11017:11057]

B:BD[13.11057] → [4.4908:4942]

    create_monster(
        mgen_data(
            skeltypes[power_level],
            friendly ? BEH_FRIENDLY : BEH_HOSTILE,
            std::min(power / 50, 6), 0,
            you.pos(), MHITYOU));

[18.916]

[20.2998]

    if (create_monster(mgen_data(skeltypes[power_level],
                                 friendly ? BEH_FRIENDLY : BEH_HOSTILE,
                                 std::min(power / 50, 6), 0,
                                 you.pos(), MHITYOU),
                       false) == -1)
    {
        mpr("You see a puff of smoke.");
    }

Replacement in crawl-ref/source/decks.cc at line 2894 [5.3987460]

B:BD[20.3417] → [6.52916:52936]

B:BD[6.52936] → [12.3670:3751]

B:BD[12.3751] → [13.11058:11104]

B:BD[13.11104] → [4.4943:4983]

    create_monster(
        mgen_data(ugly,
                  friendly ? BEH_FRIENDLY : BEH_HOSTILE,
                  std::min(power / 50, 6), 0,
                  you.pos(), MHITYOU));

[20.3417]

[21.732]

    if (create_monster(mgen_data(ugly,
                                 friendly ? BEH_FRIENDLY : BEH_HOSTILE,
                                 std::min(power / 50, 6), 0,
                                 you.pos(), MHITYOU),
                       false) == -1)
    {
        mpr("You see a puff of smoke.");
    }