fiddlerwoaroof/crawl - Change A43NYENITQ3BRLUMCFT3T5CM2NFXCIDRX7OCMEAXXGNTJIDDS6YQC

* Fix Bat Form restrictions not applying to choice by clicking (Tiles).

Allow </> as synonyms for left/right hand in swap_rings().

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

Created by j-p-e-g on May 18, 2009

A43NYENITQ3BRLUMCFT3T5CM2NFXCIDRX7OCMEAXXGNTJIDDS6YQC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/spl-cast.cc at line 201 [5.293070]
[3.1517]
[3.1517]
```
    bool bonus = 0;
```

Insertion in crawl-ref/source/spl-cast.cc at line 209 [5.293070]

[3.1666]

    case SPELL_MEPHITIC_CLOUD:
    case SPELL_FIREBALL:
    case SPELL_FREEZING_CLOUD:
    case SPELL_POISONOUS_CLOUD:
        // Increase range by one due to cloud radius.
        bonus = 1;
        break;

Replacement in crawl-ref/source/spl-cast.cc at line 228 [5.293070]
B:BD[3.1903] → [3.1903:1929]
```
    if (range < minRange)
```
[3.1903]
[3.1929]
```
    if (range + bonus < minRange)
```

Insertion in crawl-ref/source/spl-book.cc at line 1335 [5.397614]

[5.426288]

    if (player_in_bat_form())
    {
        canned_msg(MSG_PRESENT_FORM);
        return (false);
    }

Replacement in crawl-ref/source/player.h at line 329 [5.945993]

B:BD[5.957905] → [4.2722:2904]

/* ***********************************************************************
 * called from: acr - travel
 * *********************************************************************** */

[5.957905]

[4.2904]

bool player_in_bat_form();

Insertion in crawl-ref/source/player.cc at line 428 [5.962854]

[6.2698]

[4.2936]

}
bool player_in_bat_form()
{
    return (you.attribute[ATTR_TRANSFORMATION] == TRAN_BAT);

Replacement in crawl-ref/source/player.cc at line 438 [5.962854]
B:BD[4.3006] → [4.3006:3067]
```
    return (you.attribute[ATTR_TRANSFORMATION] != TRAN_BAT);
```
[4.3006]
[7.2159]
```
    return !player_in_bat_form();
```
Replacement in crawl-ref/source/player.cc at line 1104 [5.962854]
B:BD[5.973537] → [8.4281:4337]
```
    if (you.attribute[ATTR_TRANSFORMATION] == TRAN_BAT)
```
[5.973537]
[8.4337]
```
    if (player_in_bat_form())
```

Replacement in crawl-ref/source/player.cc at line 1926 [5.962854]

B:BD[5.987472] → [8.5210:5275]

        else if (you.attribute[ATTR_TRANSFORMATION] == TRAN_BAT)

[5.987472]

[8.5275]

        else if (player_in_bat_form())

Replacement in crawl-ref/source/player.cc at line 3608 [5.962854]

B:BD[9.3903] → [9.3903:3975]

                else if (you.attribute[ATTR_TRANSFORMATION] == TRAN_BAT

[9.3903]

[10.3157]

                else if (player_in_bat_form()

Replacement in crawl-ref/source/player.cc at line 3890 [5.962854]

B:BD[11.4859] → [11.4859:4965]

        if ((you.species != SP_VAMPIRE
                || you.attribute[ATTR_TRANSFORMATION] != TRAN_BAT)

[11.4859]

[11.4965]

        if ((you.species != SP_VAMPIRE || !player_in_bat_form())

Replacement in crawl-ref/source/item_use.cc at line 846 [5.2781507]
B:BD[5.2797664] → [12.3694:3750]
```
    if (you.attribute[ATTR_TRANSFORMATION] == TRAN_BAT)
```
[5.2797664]
[12.3750]
```
    if (player_in_bat_form())
```
Replacement in crawl-ref/source/item_use.cc at line 3349 [5.2781507]
B:BD[13.752752] → [13.752752:752799]
```
static int prompt_ring_to_remove(int new_ring)
```
[13.752752]
[13.752799]
```
static int _prompt_ring_to_remove(int new_ring)
```

Replacement in crawl-ref/source/item_use.cc at line 3351 [5.2781507]

B:BD[13.752801] → [14.5388:5513]

    const item_def &left  = you.inv[you.equip[EQ_LEFT_RING]];
    const item_def &right = you.inv[you.equip[EQ_RIGHT_RING]];

[13.752801]

[13.752930]

    const item_def *left  = you.slot_item(EQ_LEFT_RING);
    const item_def *right = you.slot_item(EQ_RIGHT_RING);

Replacement in crawl-ref/source/item_use.cc at line 3354 [5.2781507]
B:BD[13.752931] → [13.752931:752980]
```
    if (item_cursed(left) && item_cursed(right))
```
[13.752931]
[5.2835783]
```
    if (item_cursed(*left) && item_cursed(*right))
```

Replacement in crawl-ref/source/item_use.cc at line 3363 [5.2781507]

B:BD[13.753140] → [14.5514:5605]

    char lslot = index_to_letter(left.link);
    char rslot = index_to_letter(right.link);

[13.753140]

[13.753231]

    const char lslot = index_to_letter(left->link);
    const char rslot = index_to_letter(right->link);

Replacement in crawl-ref/source/item_use.cc at line 3367 [5.2781507]

B:BD[13.753255] → [14.5606:5674]

         "You're wearing two rings. Remove which one? (%c/%c/Esc)",

[13.753255]

[14.5674]

         "You're wearing two rings. Remove which one? (%c/%c/<</>/Esc)",

Replacement in crawl-ref/source/item_use.cc at line 3370 [5.2781507]

B:BD[14.5699] → [14.5699:5804]

    mprf(" %s", left.name(DESC_INVENTORY).c_str());
    mprf(" %s", right.name(DESC_INVENTORY).c_str());

[14.5699]

[13.753458]

    mprf(" < or %s", left->name(DESC_INVENTORY).c_str());
    mprf(" > or %s", right->name(DESC_INVENTORY).c_str());

Replacement in crawl-ref/source/item_use.cc at line 3376 [5.2781507]

∅:D[12.3855] → [13.753498:753563]

B:BD[13.753498] → [13.753498:753563]

    while (c != lslot && c != rslot && c != ESCAPE && c != ' ');

[13.753498]

[13.753563]

    while (c != lslot && c != rslot && c != '<' && c != '>'
           && c != ESCAPE && c != ' ');

Replacement in crawl-ref/source/item_use.cc at line 3384 [5.2781507]

B:BD[15.546] → [14.5805:5873]

    const int eqslot = (c == lslot) ? EQ_LEFT_RING : EQ_RIGHT_RING;

[15.546]

[13.753633]

    const int eqslot = (c == lslot || c == '<') ? EQ_LEFT_RING
                                                : EQ_RIGHT_RING;

Replacement in crawl-ref/source/item_use.cc at line 3476 [5.2781507]

B:BD[13.753950] → [13.753950:754067]

    // Ask the player which existing ring is persona non grata.
    int unwanted = prompt_ring_to_remove(ring_slot);

[13.753950]

[13.754067]

    const item_def* lring = you.slot_item(EQ_LEFT_RING);
    const item_def* rring = you.slot_item(EQ_RIGHT_RING);
    if (item_cursed(*lring) && item_cursed(*rring))
    {
        mprf("You're already wearing two cursed rings!");
        return (false);
    }
    int unwanted;
    // Don't prompt if both rings are of the same type.
    if (lring->sub_type == rring->sub_type
        && !is_artefact(*lring) && !is_artefact(*rring))
    {
        if (item_cursed(*lring))
            unwanted = you.equip[EQ_RIGHT_RING];
        else
            unwanted = you.equip[EQ_LEFT_RING];
    }
    else
    {
        // Ask the player which existing ring is persona non grata.
        unwanted = _prompt_ring_to_remove(ring_slot);
    }

Replacement in crawl-ref/source/item_use.cc at line 3622 [5.2781507]
B:BD[16.367250] → [12.3856:3912]
```
    if (you.attribute[ATTR_TRANSFORMATION] == TRAN_BAT)
```
[16.367250]
[12.3912]
```
    if (player_in_bat_form())
```
Replacement in crawl-ref/source/item_use.cc at line 3730 [5.2781507]
B:BD[5.2836571] → [12.4014:4070]
```
    if (you.attribute[ATTR_TRANSFORMATION] == TRAN_BAT)
```
[5.2836571]
[12.4070]
```
    if (player_in_bat_form())
```

Insertion in crawl-ref/source/item_use.cc at line 3873 [5.2781507]

[5.2840970]

[17.13770]

    if (player_in_bat_form())
    {
        canned_msg(MSG_PRESENT_FORM);
        return;
    }

Replacement in crawl-ref/source/item_use.cc at line 4137 [5.2781507]
B:BD[5.2845644] → [18.444:500]
```
    if (you.attribute[ATTR_TRANSFORMATION] == TRAN_BAT)
```
[5.2845644]
[18.500]
```
    if (player_in_bat_form())
```

Insertion in crawl-ref/source/item_use.cc at line 4820 [5.2781507]

[5.2858608]

    if (player_in_bat_form())
    {
        canned_msg(MSG_PRESENT_FORM);
        return;
    }

Insertion in crawl-ref/source/item_use.cc at line 5505 [5.2781507]

[19.5851041]

[20.7232]

            if (player_in_bat_form())
            {
                mpr("You can't wear or remove anything in your present form.");
                return;
            }

Insertion in crawl-ref/source/it_use3.cc at line 480 [5.2870456]

[5.2880687]

        return (false);
    }
    if (player_in_bat_form())
    {
        canned_msg(MSG_PRESENT_FORM);

Replacement in crawl-ref/source/food.cc at line 971 [5.3043806]

B:BD[21.9972] → [22.3096:3164]

            else if (you.attribute[ATTR_TRANSFORMATION] == TRAN_BAT

[21.9972]

[21.10088]

            else if (player_in_bat_form()

Replacement in crawl-ref/source/fight.cc at line 792 [5.3140790]
∅:D[23.4853] → [24.5314:5388]
B:BD[24.5314] → [24.5314:5388]
```
    if (needs_bite_msg && you.attribute[ATTR_TRANSFORMATION] != TRAN_BAT)
```
[23.4853]
[24.5388]
```
    if (needs_bite_msg && !player_in_bat_form())
```
Replacement in crawl-ref/source/fight.cc at line 812 [5.3140790]
B:BD[25.10908] → [25.10908:10968]
```
        if (you.attribute[ATTR_TRANSFORMATION] == TRAN_BAT)
```
[25.10908]
[25.10968]
```
        if (player_in_bat_form())
```
Replacement in crawl-ref/source/fight.cc at line 832 [5.3140790]
∅:D[23.4951] → [24.6422:6482]
∅:D[25.11202] → [24.6422:6482]
B:BD[24.6422] → [24.6422:6482]
```
        if (you.attribute[ATTR_TRANSFORMATION] == TRAN_BAT)
```
[25.11202]
[25.11203]
```
        if (player_in_bat_form())
```

Replacement in crawl-ref/source/fight.cc at line 1694 [5.3140790]

∅:D[24.8496] → [26.3212:3328]

B:BD[26.3212] → [26.3212:3328]

    if (damage < HIT_WEAK && (you.species != SP_VAMPIRE
        || you.attribute[ATTR_TRANSFORMATION] != TRAN_BAT))

[24.8496]

[7.50676]

    if (damage < HIT_WEAK
        && (you.species != SP_VAMPIRE || !player_in_bat_form()))

Replacement in crawl-ref/source/fight.cc at line 3148 [5.3140790]

B:BD[24.9250] → [24.9250:9313]

            && you.attribute[ATTR_TRANSFORMATION] == TRAN_BAT)

[24.9250]

[24.9313]

            && player_in_bat_form())

Deletion in crawl-ref/source/fight.cc at line 3895 [5.3140790]
B:BD[7.76833] → [2.2778:2856]
```
        const bool is_bat = (you.attribute[ATTR_TRANSFORMATION] == TRAN_BAT);
```

Replacement in crawl-ref/source/fight.cc at line 3896 [5.3140790]

B:BD[2.2880] → [2.2880:2989]

            std::max(10 - you.skills[SK_UNARMED_COMBAT] / (is_bat ? 3 : 5),
                     min_delay);

[2.2880]

[7.77030]

            std::max(10 - you.skills[SK_UNARMED_COMBAT]
                        / (player_in_bat_form() ? 3 : 5), min_delay);

Replacement in crawl-ref/source/fight.cc at line 3972 [5.3140790]
B:BD[5.3196365] → [8.24160:24216]
```
    if (you.attribute[ATTR_TRANSFORMATION] == TRAN_BAT)
```
[5.3196365]
[23.5414]
```
    if (player_in_bat_form())
```

Replacement in crawl-ref/source/delay.cc at line 831 [5.3963459]

B:BD[27.6649] → [27.6649:6761]

            || you.hunger_state > HS_SATIATED
               && you.attribute[ATTR_TRANSFORMATION] == TRAN_BAT)

[27.6649]

[27.6761]

            || you.hunger_state > HS_SATIATED && player_in_bat_form())

Replacement in crawl-ref/source/acr.cc at line 1566 [5.4397395]
B:BD[13.1265687] → [12.5454:5514]
```
        if (you.attribute[ATTR_TRANSFORMATION] == TRAN_BAT)
```
[13.1265687]
[12.5514]
```
        if (player_in_bat_form())
```

Deletion in crawl-ref/source/acr.cc at line 1591 [5.4397395]

B:BD[5.4431090] → [18.980:1119]

        if (you.attribute[ATTR_TRANSFORMATION] == TRAN_BAT)
        {
           canned_msg(MSG_PRESENT_FORM);
           break;
        }

Deletion in crawl-ref/source/acr.cc at line 1596 [5.4397395]

B:BD[5.4431223] → [18.1120:1259]

        if (you.attribute[ATTR_TRANSFORMATION] == TRAN_BAT)
        {
           canned_msg(MSG_PRESENT_FORM);
           break;
        }

Deletion in crawl-ref/source/acr.cc at line 1637 [5.4397395]

B:BD[5.4432115] → [18.1260:1399]

        if (you.attribute[ATTR_TRANSFORMATION] == TRAN_BAT)
        {
           canned_msg(MSG_PRESENT_FORM);
           break;
        }

Replacement in crawl-ref/source/acr.cc at line 1657 [5.4397395]
∅:D[3.7601] → [18.1400:1460]
B:BD[5.4432560] → [18.1400:1460]
```
        if (you.attribute[ATTR_TRANSFORMATION] == TRAN_BAT)
```
[3.7601]
[5.4432640]
```
        if (player_in_bat_form())
```

Replacement in crawl-ref/source/acr.cc at line 2140 [5.4397395]

∅:D[28.3124] → [29.372:464]

B:BD[30.409] → [29.372:464]

    if (you.species != SP_VAMPIRE
        || you.attribute[ATTR_TRANSFORMATION] != TRAN_BAT

[28.3124]

[22.3620]

    if (you.species != SP_VAMPIRE || !player_in_bat_form()

Replacement in crawl-ref/source/acr.cc at line 3100 [5.4397395]
B:BD[5.4466637] → [31.3424:3480]
```
    if (you.attribute[ATTR_TRANSFORMATION] == TRAN_BAT)
```
[5.4466637]
[31.3480]
```
    if (player_in_bat_form())
```

Replacement in crawl-ref/source/abl-show.cc at line 946 [5.4494389]

B:BD[32.6815] → [32.6815:6878]

             && you.attribute[ATTR_TRANSFORMATION] == TRAN_BAT

[32.6815]

[32.6878]

             && player_in_bat_form()

* Fix Bat Form restrictions not applying to choice by clicking (Tiles).

Dependencies

In channels

Change contents

Insertion in crawl-ref/source/spl-cast.cc at line 201 [5.293070]

Insertion in crawl-ref/source/spl-cast.cc at line 209 [5.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 228 [5.293070]

Insertion in crawl-ref/source/spl-book.cc at line 1335 [5.397614]

Replacement in crawl-ref/source/player.h at line 329 [5.945993]

Insertion in crawl-ref/source/player.cc at line 428 [5.962854]

Replacement in crawl-ref/source/player.cc at line 438 [5.962854]

Replacement in crawl-ref/source/player.cc at line 1104 [5.962854]

Replacement in crawl-ref/source/player.cc at line 1926 [5.962854]

Replacement in crawl-ref/source/player.cc at line 3608 [5.962854]

Replacement in crawl-ref/source/player.cc at line 3890 [5.962854]

Replacement in crawl-ref/source/item_use.cc at line 846 [5.2781507]

Replacement in crawl-ref/source/item_use.cc at line 3349 [5.2781507]

Replacement in crawl-ref/source/item_use.cc at line 3351 [5.2781507]

Replacement in crawl-ref/source/item_use.cc at line 3354 [5.2781507]

Replacement in crawl-ref/source/item_use.cc at line 3363 [5.2781507]

Replacement in crawl-ref/source/item_use.cc at line 3367 [5.2781507]

Replacement in crawl-ref/source/item_use.cc at line 3370 [5.2781507]

Replacement in crawl-ref/source/item_use.cc at line 3376 [5.2781507]

Replacement in crawl-ref/source/item_use.cc at line 3384 [5.2781507]

Replacement in crawl-ref/source/item_use.cc at line 3476 [5.2781507]

Replacement in crawl-ref/source/item_use.cc at line 3622 [5.2781507]

Replacement in crawl-ref/source/item_use.cc at line 3730 [5.2781507]

Insertion in crawl-ref/source/item_use.cc at line 3873 [5.2781507]

Replacement in crawl-ref/source/item_use.cc at line 4137 [5.2781507]

Insertion in crawl-ref/source/item_use.cc at line 4820 [5.2781507]

Insertion in crawl-ref/source/item_use.cc at line 5505 [5.2781507]

Insertion in crawl-ref/source/it_use3.cc at line 480 [5.2870456]

Replacement in crawl-ref/source/food.cc at line 971 [5.3043806]

Replacement in crawl-ref/source/fight.cc at line 792 [5.3140790]

Replacement in crawl-ref/source/fight.cc at line 812 [5.3140790]

Replacement in crawl-ref/source/fight.cc at line 832 [5.3140790]

Replacement in crawl-ref/source/fight.cc at line 1694 [5.3140790]

Replacement in crawl-ref/source/fight.cc at line 3148 [5.3140790]

Deletion in crawl-ref/source/fight.cc at line 3895 [5.3140790]

Replacement in crawl-ref/source/fight.cc at line 3896 [5.3140790]

Replacement in crawl-ref/source/fight.cc at line 3972 [5.3140790]

Replacement in crawl-ref/source/delay.cc at line 831 [5.3963459]

Replacement in crawl-ref/source/acr.cc at line 1566 [5.4397395]

Deletion in crawl-ref/source/acr.cc at line 1591 [5.4397395]

Deletion in crawl-ref/source/acr.cc at line 1596 [5.4397395]

Deletion in crawl-ref/source/acr.cc at line 1637 [5.4397395]

Replacement in crawl-ref/source/acr.cc at line 1657 [5.4397395]

Replacement in crawl-ref/source/acr.cc at line 2140 [5.4397395]

Replacement in crawl-ref/source/acr.cc at line 3100 [5.4397395]

Replacement in crawl-ref/source/abl-show.cc at line 946 [5.4494389]