fiddlerwoaroof/crawl - Change 4QRLZDW4KBFG34B3MCG4375NHFR3WKWSLWQKRMQ3OE5R26WCZBBQC

Fix Evaporate prompt doing the opposite of the player's answer.

Fix some more instances of crashes resulting from PROMPT_NOTHING. Change shadow dragon corpse type to rotting.

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

Created by j-p-e-g on July 15, 2008

4QRLZDW4KBFG34B3MCG4375NHFR3WKWSLWQKRMQ3OE5R26WCZBBQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/spl-cast.cc at line 1022 [9.293070]
∅:D[6.297] → [8.455:485]
B:BD[8.455] → [8.455:485]
```
            if (potion == -1)
```
[6.297]
[8.485]
```
            if (prompt_failed(potion))
```

Replacement in crawl-ref/source/spl-cast.cc at line 1025 [9.293070]

B:BD[8.523] → [8.523:586]

            else if (you.inv[potion].base_type != OBJ_POTIONS)

[8.523]

[8.586]


            if (you.inv[potion].base_type != OBJ_POTIONS)

Replacement in crawl-ref/source/spells4.cc at line 1422 [9.436250]

B:BD[10.1521] → [10.1521:1767]

    beem.source_x      = you.x_pos;
    beem.source_y      = you.y_pos;
    beem.can_see_invis = player_see_invis();
    beem.smart_monster = true;
    beem.attitude      = ATT_FRIENDLY;
    beem.fr_count      = 0;
    beem.is_tracer     = true;

[10.1521]

[10.1767]

    beem.source_x       = you.x_pos;
    beem.source_y       = you.y_pos;
    beem.can_see_invis  = player_see_invis();
    beem.smart_monster  = true;
    beem.attitude       = ATT_FRIENDLY;
    beem.fr_count       = 0;
    beem.beam_cancelled = false;
    beem.is_tracer      = true;

Replacement in crawl-ref/source/spells4.cc at line 1432 [9.436250]
B:BD[10.1789] → [10.1789:1816]
```
    if (beem.fr_count > 0)
```
[10.1789]
[10.1816]
```
    if (beem.beam_cancelled)
```

Replacement in crawl-ref/source/spells4.cc at line 1434 [9.436250]

B:BD[10.1822] → [10.1822:1875]

        // We don't want to fire through friendlies.

[10.1822]

[10.1875]

        // We don't want to fire through friendlies or at ourselves.

Replacement in crawl-ref/source/quiver.cc at line 150 [12.3828]
B:BD[11.3514] → [11.3514:3578]
```
    if (slot == PROMPT_ABORT)
    {
        canned_msg(MSG_OK);
```
[11.3514]
[11.3578]
```
    if (prompt_failed(slot))
```
Deletion in crawl-ref/source/quiver.cc at line 152 [12.3828]
B:BD[11.3594] → [11.3594:3653]
```
    }
    else if (slot == PROMPT_NOTHING)
        return;
```

Replacement in crawl-ref/source/mon-data.h at line 1892 [9.1826214]

B:BD[13.57215] → [3.2584:2659]

    15, 10, MST_SHADOW_DRAGON, CE_MUTAGEN_RANDOM, Z_BIG, S_ROAR, I_ANIMAL,

[13.57215]

[14.3706]

    15, 10, MST_SHADOW_DRAGON, CE_HCL, Z_BIG, S_ROAR, I_ANIMAL,

Replacement in crawl-ref/source/item_use.cc at line 801 [9.2781507]
B:BD[9.2797197] → [9.2797197:2797252]
```
}                               // end armour_prompt()
```
[9.2797197]
[9.2797252]
```
}
```

Replacement in crawl-ref/source/item_use.cc at line 3161 [9.2781507]

B:BD[15.367601] → [2.3058:3178]

                        MT_INVLIST, OBJ_JEWELLERY, true, true, true, 0, -1,
                        NULL, OPER_PUTON );

[15.367601]

[2.3178]

                                        MT_INVLIST, OBJ_JEWELLERY, true, true,
                                        true, 0, -1, NULL, OPER_PUTON );

Replacement in crawl-ref/source/item_use.cc at line 3307 [9.2781507]

∅:D[16.5216] → [17.4369:4588]

B:BD[18.1237] → [17.4369:4588]

B:BD[17.4588] → [2.3185:3257]

            (slot == -1)? prompt_invent_item( "Remove which piece of jewellery?",
                                              MT_INVLIST,
                                              OBJ_JEWELLERY, true, true, true,
                                              0, -1, NULL, OPER_REMOVE)

[16.5216]

[17.4656]

            (slot == -1)? prompt_invent_item("Remove which piece of jewellery?",
                                             MT_INVLIST,
                                             OBJ_JEWELLERY, true, true, true,
                                             0, -1, NULL, OPER_REMOVE)

Insertion in crawl-ref/source/item_use.cc at line 3596 [9.2781507]
[19.12207]
[20.2940]
Replacement in crawl-ref/source/item_use.cc at line 4105 [9.2781507]
B:BD[21.4899] → [7.2820:2886]
∅:D[7.2886] → [21.4934:4940]
∅:D[22.7204] → [21.4934:4940]
B:BD[21.4934] → [21.4934:4940]
B:BD[21.4940] → [7.2887:2960]
```
    if (item_slot == PROMPT_ABORT || item_slot == PROMPT_NOTHING)
    {
        if (item_slot == PROMPT_ABORT)
            canned_msg( MSG_OK );
```
[21.4899]
[21.4970]
```
    if (prompt_failed(item_slot))
```
Deletion in crawl-ref/source/item_use.cc at line 4107 [9.2781507]
B:BD[21.4994] → [21.4994:5000]
```
    }
```

Insertion in crawl-ref/source/invent.cc at line 356 [9.2920632]

[20.4164]

    case OBJ_POTIONS:
        return("You aren't carrying any potions.");

Deletion in crawl-ref/source/command.cc at line 143 [9.4082507]
B:BD[23.3335] → [24.3268:3296]
```
    bool skip_lines = true;
```

Replacement in crawl-ref/source/command.cc at line 154 [9.4082507]

B:BD[24.3556] → [24.3556:3624]

B:BD[24.3624] → [25.3307:3374]

∅:D[25.3374] → [24.3671:3760]

B:BD[24.3671] → [24.3671:3760]

∅:D[24.3760] → [23.4069:4083]

B:BD[23.4069] → [23.4069:4083]

B:BD[23.4083] → [24.3761:3823]

∅:D[24.3823] → [23.4281:4295]

B:BD[23.4281] → [23.4281:4295]

B:BD[23.4726] → [23.4726:4755]

B:BD[23.4957] → [23.4957:4980]

B:BD[23.4980] → [24.3824:3834]

        // Give up if you encountered the second set of underliners
        // and still haven't encountered the keyword "Highlights".
        if (help.find("---") != std::string::npos)
        {
            if (skip_lines)
            {
                skip_lines = false;
                continue;
            }
            else if (!start)
                break;
        }

[24.3556]

[24.3834]


        // Give up if you encounter an older version.
        if (help.find("Stone Soup 0.3.4") != std::string::npos)
            break;

Replacement in crawl-ref/source/beam.cc at line 692 [9.4128068]

B:BD[26.29612] → [26.29612:29718]

B:BD[26.29747] → [26.29747:29865]

    pbolt.is_tracer     = true;
    pbolt.source_x      = you.x_pos;
    pbolt.source_y      = you.y_pos;
    pbolt.can_see_invis = player_see_invis();
    pbolt.smart_monster = true;
    pbolt.attitude      = ATT_FRIENDLY;

[26.29612]

[26.29865]

    pbolt.is_tracer      = true;
    pbolt.source_x       = you.x_pos;
    pbolt.source_y       = you.y_pos;
    pbolt.can_see_invis  = player_see_invis();
    pbolt.smart_monster  = true;
    pbolt.attitude       = ATT_FRIENDLY;

Replacement in crawl-ref/source/beam.cc at line 700 [9.4128068]

∅:D[27.8651] → [26.29895:30110]

B:BD[26.29895] → [26.29895:30110]

B:BD[26.30110] → [5.2900:2933]

∅:D[5.2933] → [28.3316:3370]

B:BD[28.3316] → [28.3316:3370]

    pbolt.foe_count     = pbolt.fr_count = 0;
    pbolt.foe_power     = pbolt.fr_power = 0;
    pbolt.fr_helped     = pbolt.fr_hurt  = 0;
    pbolt.foe_helped    = pbolt.foe_hurt = 0;
    pbolt.foe_ratio     = 100;
    pbolt.beam_cancelled= false;
    pbolt.dont_stop_foe = pbolt.dont_stop_fr = false;

[27.8651]

[26.30110]

    pbolt.foe_count      = pbolt.fr_count = 0;
    pbolt.foe_power      = pbolt.fr_power = 0;
    pbolt.fr_helped      = pbolt.fr_hurt  = 0;
    pbolt.foe_helped     = pbolt.foe_hurt = 0;
    pbolt.foe_ratio      = 100;
    pbolt.beam_cancelled = false;
    pbolt.dont_stop_foe  = pbolt.dont_stop_fr = pbolt.dont_stop_player = false;

Replacement in crawl-ref/source/acr.cc at line 568 [9.4397395]
∅:D[29.15553] → [9.4409507:4409619]
∅:D[4.22639] → [9.4409507:4409619]
∅:D[30.1256526] → [9.4409507:4409619]
B:BD[9.4409507] → [9.4409507:4409619]
```
        if (i == PROMPT_ABORT || !is_random_artefact( you.inv[i] ))
        {
            canned_msg( MSG_OK );
```
[4.22639]
[9.4409619]
```
        if (prompt_failed(i))
```

Replacement in crawl-ref/source/acr.cc at line 571 [9.4397395]

B:BD[9.4409638] → [9.4409638:4409648]

[9.4409638]

[9.4409648]

        else if (!is_random_artefact( you.inv[i] ))
            mpr("That item is not an artefact!");

Replacement in crawl-ref/source/acr.cc at line 582 [9.4397395]
∅:D[31.12886] → [9.4409903:4409978]
∅:D[29.15627] → [9.4409903:4409978]
∅:D[4.22784] → [9.4409903:4409978]
∅:D[30.1256634] → [9.4409903:4409978]
B:BD[9.4409903] → [9.4409903:4409978]
```
        if (i == PROMPT_ABORT)
        {
            canned_msg( MSG_OK );
```
[4.22784]
[32.4370]
```
        if (prompt_failed(i))
```
Deletion in crawl-ref/source/acr.cc at line 585 [9.4397395]
B:BD[32.4389] → [32.4389:4399]
```
        }
```
Replacement in crawl-ref/source/acr.cc at line 686 [9.4397395]
∅:D[4.22962] → [33.27506:27581]
B:BD[33.27506] → [33.27506:27581]
```
        if (i == PROMPT_ABORT)
        {
            canned_msg( MSG_OK );
```
[4.22962]
[33.27581]
```
        if (prompt_failed(i))
```
Deletion in crawl-ref/source/acr.cc at line 689 [9.4397395]
B:BD[33.27600] → [33.27600:27610]
```
        }
```

Fix Evaporate prompt doing the opposite of the player's answer.

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/spl-cast.cc at line 1022 [9.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 1025 [9.293070]

Replacement in crawl-ref/source/spells4.cc at line 1422 [9.436250]

Replacement in crawl-ref/source/spells4.cc at line 1432 [9.436250]

Replacement in crawl-ref/source/spells4.cc at line 1434 [9.436250]

Replacement in crawl-ref/source/quiver.cc at line 150 [12.3828]

Deletion in crawl-ref/source/quiver.cc at line 152 [12.3828]

Replacement in crawl-ref/source/mon-data.h at line 1892 [9.1826214]

Replacement in crawl-ref/source/item_use.cc at line 801 [9.2781507]

Replacement in crawl-ref/source/item_use.cc at line 3161 [9.2781507]

Replacement in crawl-ref/source/item_use.cc at line 3307 [9.2781507]

Insertion in crawl-ref/source/item_use.cc at line 3596 [9.2781507]

Replacement in crawl-ref/source/item_use.cc at line 4105 [9.2781507]

Deletion in crawl-ref/source/item_use.cc at line 4107 [9.2781507]

Insertion in crawl-ref/source/invent.cc at line 356 [9.2920632]

Deletion in crawl-ref/source/command.cc at line 143 [9.4082507]

Replacement in crawl-ref/source/command.cc at line 154 [9.4082507]

Replacement in crawl-ref/source/beam.cc at line 692 [9.4128068]

Replacement in crawl-ref/source/beam.cc at line 700 [9.4128068]

Replacement in crawl-ref/source/acr.cc at line 568 [9.4397395]

Replacement in crawl-ref/source/acr.cc at line 571 [9.4397395]

Replacement in crawl-ref/source/acr.cc at line 582 [9.4397395]

Deletion in crawl-ref/source/acr.cc at line 585 [9.4397395]

Replacement in crawl-ref/source/acr.cc at line 686 [9.4397395]

Deletion in crawl-ref/source/acr.cc at line 689 [9.4397395]