fiddlerwoaroof/crawl - Change RQ24Y25QDO2GY65XESEVBCP6VXCB7BDTWXO42IPPI6UPRJQ5XYDAC

* Fix 2744875 (mutation screen assert).

Rename KeymapContext KC_* -> KMC_* to avoid overlap with kill_category KC_*.
Increase odds for chaos brands mimicking brands that hurt the defender.
Tweak chaos_affects_attacker().

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

Created by j-p-e-g on April 11, 2009

RQ24Y25QDO2GY65XESEVBCP6VXCB7BDTWXO42IPPI6UPRJQ5XYDAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/xom.cc at line 503 [9.3]
B:BD[8.475] → [8.475:494]
```
           return;
```
[8.475]
[8.494]
```
            return;
```
Replacement in crawl-ref/source/xom.cc at line 511 [9.3]
B:BD[8.647] → [8.647:666]
```
           return;
```
[8.647]
[8.666]
```
            return;
```

Replacement in crawl-ref/source/travel.cc at line 2565 [10.39949]

B:BD[3.270] → [3.270:327]

        you.attribute[ATTR_WEAPON_SWAP_INTERRUPTED] = 0;

[3.270]

[3.327]

        maybe_clear_weapon_swap();

Replacement in crawl-ref/source/travel.cc at line 2980 [10.39949]
B:BD[3.367] → [3.367:420]
```
    you.attribute[ATTR_WEAPON_SWAP_INTERRUPTED] = 0;
```
[3.367]
[3.420]
```
    maybe_clear_weapon_swap();
```
Insertion in crawl-ref/source/transfor.h at line 31 [13.142596]
[11.24804]
[12.130]
```
bool transformation_can_wield(transformation_type trans);
```
Replacement in crawl-ref/source/stuff.cc at line 1057 [13.224557]
B:BD[13.239385] → [14.135:173]
```
        int tmp = getchm(KC_CONFIRM);
```
[13.239385]
[13.239424]
```
        int tmp = getchm(KMC_CONFIRM);
```
Replacement in crawl-ref/source/stuff.cc at line 1158 [13.224557]
B:BD[15.106325] → [14.174:212]
```
        int tmp = getchm(KC_CONFIRM);
```
[15.106325]
[15.106364]
```
        int tmp = getchm(KMC_CONFIRM);
```
Insertion in crawl-ref/source/player.cc at line 7170 [13.962854]
[16.149]
[17.7427]
```
}
bool player::is_fiery() const
{
    return (false);
```

Insertion in crawl-ref/source/player.cc at line 7516 [13.962854]

[18.5341]


        mpr("A shaft briefly opens up underneath you!");
        handle_items_on_shaft(you.pos(), false);

Deletion in crawl-ref/source/player.cc at line 7521 [13.962854]

B:BD[18.5389] → [18.5389:5460]

B:BD[18.5460] → [19.18979:19032]

        {
            mpr("A shaft briefly opens up underneath you!");
            handle_items_on_shaft(you.pos(), false);

Deletion in crawl-ref/source/player.cc at line 7522 [13.962854]
B:BD[18.5487] → [18.5487:5497]
```
        }
```
Insertion in crawl-ref/source/mutation.cc at line 1533 [13.1263003]
[20.3728]
[20.3728]
```
    ASSERT(you.species == SP_VAMPIRE);
```

Replacement in crawl-ref/source/mutation.cc at line 1628 [13.1263003]

B:BD[20.7140] → [20.7140:7181]

B:BD[20.7181] → [21.5552:5595]

∅:D[21.5595] → [20.7181:7216]

B:BD[20.7181] → [20.7181:7216]

B:BD[20.7216] → [21.5596:5647]

∅:D[21.5647] → [20.7242:7281]

B:BD[20.7242] → [20.7242:7281]

    if (you.species == SP_VAMPIRE)
    {
        mouse_control mc(MOUSE_MODE_MORE);
        const int keyin = getch();
        if (keyin == '!' || keyin == CK_MOUSE_CMD)
            display_mutations();
    }

[20.7140]

[20.7281]

    mouse_control mc(MOUSE_MODE_MORE);
    const int keyin = getch();
    if (keyin == '!' || keyin == CK_MOUSE_CMD)
        display_mutations();

Insertion in crawl-ref/source/mon-util.cc at line 7679 [13.1699344]

[16.272]

}
static bool _mons_is_fiery(int mc)
{
    return (mc == MONS_FIRE_VORTEX
            || mc == MONS_FIRE_ELEMENTAL
            || mc == MONS_FLAMING_CORPSE
            || mc == MONS_EFREET
            || mc == MONS_AZRAEL
            || mc == MONS_LAVA_WORM
            || mc == MONS_LAVA_FISH
            || mc == MONS_LAVA_SNAKE
            || mc == MONS_SALAMANDER
            || mc == MONS_MOLTEN_GARGOYLE
            || mc == MONS_ORB_OF_FIRE);

Insertion in crawl-ref/source/mon-util.cc at line 7696 [13.1699344]
[16.275]
[22.6467]
```
bool monsters::is_fiery() const
{
    return (_mons_is_fiery(type));
}
```

Replacement in crawl-ref/source/menu.cc at line 96 [10.261322]

B:BD[7.3549] → [7.3549:3684]

    menu_action(ACT_EXAMINE), title(NULL), flags(_flags), tag(tagname),
    first_entry(0), y_offset(0), pagesize(0), max_pagesize(0),

[7.3549]

[7.3684]

    menu_action(ACT_EXAMINE), title(NULL), title2(NULL), flags(_flags),
    tag(tagname), first_entry(0), y_offset(0), pagesize(0), max_pagesize(0),

Replacement in crawl-ref/source/menu.cc at line 115 [10.261322]

B:BD[23.4005] → [23.4005:4075]

 : f_selitem(NULL), f_drawitem(NULL), f_keyfilter(NULL), title(NULL),

[23.4005]

[23.4075]

 : f_selitem(NULL), f_drawitem(NULL), f_keyfilter(NULL),  allow_toggle(false),
   menu_action(ACT_EXAMINE), title(NULL), title2(NULL),

Replacement in crawl-ref/source/macro.cc at line 56 [13.2457534]
B:BD[13.2459011] → [10.275150:275193]
```
static macromap Keymaps[KC_CONTEXT_COUNT];
```
[13.2459011]
[13.2459036]
```
static macromap Keymaps[KMC_CONTEXT_COUNT];
```

Replacement in crawl-ref/source/macro.cc at line 61 [13.2457534]

B:BD[10.275227] → [10.275227:275308]

B:BD[10.275308] → [14.364:390]

    &Keymaps[KC_DEFAULT],
    &Keymaps[KC_LEVELMAP],
    &Keymaps[KC_TARGETING],
    &Keymaps[KC_CONFIRM],

[10.275227]

[24.4592]

    &Keymaps[KMC_DEFAULT],
    &Keymaps[KMC_LEVELMAP],
    &Keymaps[KMC_TARGETING],
    &Keymaps[KMC_CONFIRM],

Replacement in crawl-ref/source/macro.cc at line 67 [13.2457534]
B:BD[24.4609] → [24.4609:4632]
```
    &Keymaps[KC_TILE],
```
[24.4609]
[24.4632]
```
    &Keymaps[KMC_TILE],
```

Replacement in crawl-ref/source/macro.cc at line 109 [13.2457534]

B:BD[24.5206] → [24.5206:5316]

static key_to_cmd_map _keys_to_cmds[KC_CONTEXT_COUNT];
static cmd_to_key_map _cmds_to_keys[KC_CONTEXT_COUNT];

[24.5206]

[24.5316]

static key_to_cmd_map _keys_to_cmds[KMC_CONTEXT_COUNT];
static cmd_to_key_map _cmds_to_keys[KMC_CONTEXT_COUNT];

Replacement in crawl-ref/source/macro.cc at line 461 [13.2457534]

B:BD[25.3606] → [26.4759:4832]

                                macromap &keymap = Keymaps[KC_DEFAULT] )

[25.3606]

[13.2462616]

                                macromap &keymap = Keymaps[KMC_DEFAULT] )

Replacement in crawl-ref/source/macro.cc at line 613 [13.2457534]

B:BD[13.2465249] → [27.13860:13919]

    for (int mc = KC_DEFAULT; mc < KC_CONTEXT_COUNT; ++mc)

[13.2465249]

[27.13919]

    for (int mc = KMC_DEFAULT; mc < KMC_CONTEXT_COUNT; ++mc)

Replacement in crawl-ref/source/macro.cc at line 667 [13.2457534]
∅:D[6.2741] → [10.282065:282106]
B:BD[10.282065] → [10.282065:282106]
```
    return getchm( KC_DEFAULT, rgetch );
```
[6.2741]
[10.282106]
```
    return getchm( KMC_DEFAULT, rgetch );
```
Replacement in crawl-ref/source/macro.cc at line 680 [13.2457534]
B:BD[10.282194] → [28.2785:2808]
```
    if (mc == KC_NONE)
```
[10.282194]
[28.2808]
```
    if (mc == KMC_NONE)
```
Replacement in crawl-ref/source/macro.cc at line 750 [13.2457534]
B:BD[13.2467838] → [10.282241:282279]
```
    KeymapContext keymc = KC_DEFAULT;
```
[13.2467838]
[13.2467838]
```
    KeymapContext keymc = KMC_DEFAULT;
```
Replacement in crawl-ref/source/macro.cc at line 762 [13.2457534]
B:BD[10.282439] → [10.282439:282468]
```
        keymc  = KC_DEFAULT;
```
[10.282439]
[10.282468]
```
        keymc  = KMC_DEFAULT;
```
Replacement in crawl-ref/source/macro.cc at line 767 [13.2457534]
B:BD[10.282530] → [10.282530:282560]
```
        keymc  = KC_LEVELMAP;
```
[10.282530]
[10.282560]
```
        keymc  = KMC_LEVELMAP;
```
Replacement in crawl-ref/source/macro.cc at line 772 [13.2457534]
B:BD[13.2468039] → [10.282600:282631]
```
        keymc  = KC_TARGETING;
```
[13.2468039]
[10.282631]
```
        keymc  = KMC_TARGETING;
```
Replacement in crawl-ref/source/macro.cc at line 777 [13.2457534]
B:BD[14.559] → [14.559:588]
```
        keymc  = KC_CONFIRM;
```
[14.559]
[29.2614]
```
        keymc  = KMC_CONFIRM;
```
Replacement in crawl-ref/source/macro.cc at line 782 [13.2457534]
B:BD[29.2676] → [29.2676:2702]
```
        keymc  = KC_MENU;
```
[29.2676]
[14.588]
```
        keymc  = KMC_MENU;
```

Replacement in crawl-ref/source/macro.cc at line 802 [13.2457534]

B:BD[30.16073] → [14.595:823]

B:BD[14.823] → [29.2703:2756]

∅:D[29.2756] → [14.823:857]

B:BD[14.823] → [14.823:857]

         keymap ? (keymc == KC_DEFAULT   ? "default " :
                   keymc == KC_LEVELMAP  ? "level-map " :
                   keymc == KC_TARGETING ? "targeting " :
                   keymc == KC_CONFIRM   ? "confirm " :
                   keymc == KC_MENU      ? "menu " :
                   "buggy") : "",

[30.16073]

[30.16261]

         keymap ? (keymc == KMC_DEFAULT   ? "default " :
                   keymc == KMC_LEVELMAP  ? "level-map " :
                   keymc == KMC_TARGETING ? "targeting " :
                   keymc == KMC_CONFIRM   ? "confirm " :
                   keymc == KMC_MENU      ? "menu "
                                          : "buggy") : "",

Replacement in crawl-ref/source/macro.cc at line 868 [13.2457534]
B:BD[13.2469835] → [10.283202:283240]
```
    KeymapContext keymc = KC_DEFAULT;
```
[13.2469835]
[26.6701]
```
    KeymapContext keymc = KMC_DEFAULT;
```
Replacement in crawl-ref/source/macro.cc at line 882 [13.2457534]
B:BD[13.2470167] → [10.283287:283320]
```
            keymc  = KC_DEFAULT;
```
[13.2470167]
[27.14082]
```
            keymc  = KMC_DEFAULT;
```

Replacement in crawl-ref/source/macro.cc at line 886 [13.2457534]

∅:D[27.14166] → [10.283405:283468]

B:BD[10.283405] → [10.283405:283468]

B:BD[10.283468] → [27.14167:14232]

            keymc  = KeymapContext( KC_DEFAULT + s[1] - '0' );
            if (keymc >= KC_DEFAULT && keymc < KC_CONTEXT_COUNT)

[27.14166]

[27.14232]

            keymc  = KeymapContext( KMC_DEFAULT + s[1] - '0' );
            if (keymc >= KMC_DEFAULT && keymc < KMC_CONTEXT_COUNT)

Replacement in crawl-ref/source/macro.cc at line 1068 [13.2457534]
B:BD[24.6302] → [24.6302:6346]
```
        ASSERT(context < KC_CONTEXT_COUNT);
```
[24.6302]
[24.6346]
```
        ASSERT(context < KMC_CONTEXT_COUNT);
```
Replacement in crawl-ref/source/macro.cc at line 1123 [13.2457534]
B:BD[24.7643] → [24.7643:7671]
```
    if (context == KC_NONE)
```
[24.7643]
[24.7671]
```
    if (context == KMC_NONE)
```
Replacement in crawl-ref/source/macro.cc at line 1139 [13.2457534]
B:BD[24.8022] → [24.8022:8046]
```
        return KC_TILE;
```
[24.8022]
[24.8046]
```
        return KMC_TILE;
```
Replacement in crawl-ref/source/macro.cc at line 1143 [13.2457534]
B:BD[24.8105] → [24.8105:8132]
```
        return KC_DEFAULT;
```
[24.8105]
[24.8132]
```
        return KMC_DEFAULT;
```
Replacement in crawl-ref/source/macro.cc at line 1146 [13.2457534]
B:BD[24.8191] → [24.8191:8219]
```
        return KC_LEVELMAP;
```
[24.8191]
[24.8219]
```
        return KMC_LEVELMAP;
```
Replacement in crawl-ref/source/macro.cc at line 1149 [13.2457534]
B:BD[24.8276] → [24.8276:8305]
```
        return KC_TARGETING;
```
[24.8276]
[24.8305]
```
        return KMC_TARGETING;
```
Replacement in crawl-ref/source/macro.cc at line 1151 [13.2457534]
B:BD[24.8306] → [24.8306:8326]
```
    return KC_NONE;
```
[24.8306]
[24.8326]
```
    return KMC_NONE;
```

Replacement in crawl-ref/source/macro.cc at line 1159 [13.2457534]

B:BD[24.8498] → [24.8498:8557]

    if (context == KC_NONE || command_name == "CMD_NO_CMD"

[24.8498]

[24.8557]

    if (context == KMC_NONE || command_name == "CMD_NO_CMD"

Replacement in crawl-ref/source/item_use.cc at line 4913 [13.2781507]

B:BD[31.577] → [32.64986:65065]

        big_cloud(random_smoke_type(), KC_YOU, you.pos(), 50, 8 + random2(8));

[31.577]

[33.2872]

        big_cloud(random_smoke_type(), KC_OTHER, you.pos(), 50, 8 + random2(8));

Replacement in crawl-ref/source/food.cc at line 627 [13.3043806]

B:BD[34.10516] → [35.2674:2727]

                keyin = tolower(getchm(KC_CONFIRM));

[34.10516]

[36.3488]

                keyin = tolower(getchm(KMC_CONFIRM));

Replacement in crawl-ref/source/food.cc at line 1296 [13.3043806]

B:BD[37.8614] → [37.8614:8667]

            int keyin = tolower(getchm(KC_CONFIRM));

[37.8614]

[37.8667]

            int keyin = tolower(getchm(KMC_CONFIRM));

Replacement in crawl-ref/source/food.cc at line 1448 [13.3043806]

B:BD[37.11893] → [37.11893:11946]

            int keyin = tolower(getchm(KC_CONFIRM));

[37.11893]

[37.11946]

            int keyin = tolower(getchm(KMC_CONFIRM));

Replacement in crawl-ref/source/food.cc at line 1610 [13.3043806]

B:BD[37.16492] → [37.16492:16561]

            int keyin = autoeat ? 'y' : tolower(getchm(KC_CONFIRM));

[37.16492]

[37.16561]

            int keyin = autoeat ? 'y' : tolower(getchm(KMC_CONFIRM));

Replacement in crawl-ref/source/files.cc at line 1399 [13.3084589]

B:BD[38.3369] → [38.3369:3426]

        you.attribute[ATTR_WEAPON_SWAP_INTERRUPTED] = 0;

[38.3369]

[38.3426]

        // But do not reset the weapon swap if we swapped weapons
        // because of a transformation.
        maybe_clear_weapon_swap();

Insertion in crawl-ref/source/fight.cc at line 27 [13.3140790]
[13.3142355]
[13.3142355]
```
#include "database.h"
```
Replacement in crawl-ref/source/fight.cc at line 497 [13.3140790]
B:BD[39.6472] → [40.3806:3851]
```
        name = apostrophise(atk_name(desc));
```
[39.6472]
[39.6634]
```
        name = apostrophise(atk_name(desc)) + " ";
```

Replacement in crawl-ref/source/fight.cc at line 499 [13.3140790]

B:BD[39.6635] → [39.6635:6709]

    name += weapon->name(desc, false, false, false, false, ignore_flags);

[39.6635]

[39.6709]

    name += weapon->name(DESC_PLAIN, false, false, false, false, ignore_flags);

Replacement in crawl-ref/source/fight.cc at line 2263 [13.3140790]
B:BD[8.25463] → [8.25463:25479]
```
    CHAOS_PARA,
```
[8.25463]
[8.25479]
```
    CHAOS_PARALYSIS,
```
Replacement in crawl-ref/source/fight.cc at line 2332 [13.3140790]
B:BD[39.8182] → [39.8182:8208]
```
        10, // CHAOS_PARA
```
[39.8182]
[39.8208]
```
        10, // CHAOS_PARALYSIS
```

Replacement in crawl-ref/source/fight.cc at line 2393 [13.3140790]

B:BD[39.8793] → [39.8793:9006]

        // At level == 27 there's a 20.3% chance of a level 3 miscast.
        int level1_chance = level;
        int level2_chance = std::max( 0, level - 7);
        int level3_chance = std::max( 0, level - 15);

[39.8793]

[39.9006]

        // At level == 27 there's a 13.9% chance of a level 3 miscast.
        int level0_chance = level;
        int level1_chance = std::max( 0, level - 7);
        int level2_chance = std::max( 0, level - 12);
        int level3_chance = std::max( 0, level - 17);

Insertion in crawl-ref/source/fight.cc at line 2400 [13.3140790]
[39.9047]
[39.9047]
```
            level0_chance, 0,
```
Deletion in crawl-ref/source/fight.cc at line 2409 [13.3140790]
B:BD[39.9284] → [39.9284:9285]
Replacement in crawl-ref/source/fight.cc at line 2434 [13.3140790]
B:BD[8.28692] → [8.28692:28713]
```
    case CHAOS_PARA:
```
[8.28692]
[8.28713]
```
    case CHAOS_PARALYSIS:
```

Insertion in crawl-ref/source/fight.cc at line 2537 [13.3140790]

[39.14227]

        DID_AFFECT();
    }
    // Create a colourful cloud.
    if (weapon && one_chance_in(1000))
    {
        mprf("Smoke pours forth from %s!", wep_name(DESC_NOCAP_YOUR).c_str());
        big_cloud(random_smoke_type(), KC_OTHER, attacker->pos(), 20,
                  8 + random2(4));

Replacement in crawl-ref/source/fight.cc at line 2551 [13.3140790]
B:BD[39.14333] → [39.14333:14365]
```
        && one_chance_in(1000))
```
[39.14333]
[39.14365]
```
        && one_chance_in(200))
```

Replacement in crawl-ref/source/fight.cc at line 2553 [13.3140790]

B:BD[39.14371] → [39.14371:14461]

        std::string msg = wep_name(DESC_CAP_YOUR);
        msg += " twangs alarmingly!";

[39.14371]

[39.14461]

        std::string msg = "";

Replacement in crawl-ref/source/fight.cc at line 2555 [13.3140790]

B:BD[39.14497] → [39.14497:14541]

            msg = "You hear a loud twang.";

[39.14497]

[39.14541]

        {
            std::string noise = getSpeakString("weapon_noise");
            if (!noise.empty())
                msg = "You hear " + noise;
        }
        else
        {
            msg = getSpeakString("weapon_noises");
            std::string wepname = wep_name(DESC_CAP_YOUR);
            if (!msg.empty())
            {
                msg = replace_all(msg, "@Your_weapon@", wepname);
                msg = replace_all(msg, "@The_weapon@", wepname);
            }
        }

Replacement in crawl-ref/source/fight.cc at line 2571 [13.3140790]

B:BD[39.14542] → [39.14542:14613]

        noisy(15, attacker->pos(), msg.c_str());
        DID_AFFECT();

[39.14542]

[39.14613]

        if (!msg.empty())
        {
            mpr(msg.c_str(), MSGCH_SOUND);
            noisy(15, attacker->pos());
            DID_AFFECT();
        }

Deletion in crawl-ref/source/fight.cc at line 2578 [13.3140790]
B:BD[39.14619] → [39.14619:14632]
```
    return;
```

Replacement in crawl-ref/source/fight.cc at line 2806 [13.3140790]

B:BD[8.30418] → [39.20554:20910]

    return (random_choose_weighted(
        15, SPWPN_NORMAL,
        10, SPWPN_FLAMING,
        10, SPWPN_FREEZING,
        10, SPWPN_ELECTROCUTION,
        10, SPWPN_VENOM,
        10, SPWPN_CHAOS,
         5, SPWPN_VORPAL,
         5, SPWPN_DRAINING,
         5, SPWPN_VAMPIRICISM,
         2, SPWPN_CONFUSE,
         2, SPWPN_DISTORTION,
         0));

[8.30418]

[8.30694]

    int brand = SPWPN_NORMAL;
    // Assuming the chaos to be mildly intelligent, try to avoid brands
    // that clash with the most basic resists of the defender,
    // i.e. its holiness.
    while (true)
    {
        brand = (random_choose_weighted(
                     5, SPWPN_VORPAL,
                    10, SPWPN_FLAMING,
                    10, SPWPN_FREEZING,
                    10, SPWPN_ELECTROCUTION,
                    10, SPWPN_VENOM,
                    10, SPWPN_CHAOS,
                     5, SPWPN_DRAINING,
                     5, SPWPN_VAMPIRICISM,
                     5, SPWPN_HOLY_WRATH,
                     2, SPWPN_CONFUSE,
                     2, SPWPN_DISTORTION,
                     0));
        if (one_chance_in(3))
            break;
        bool susceptible = true;
        switch (brand)
        {
        case SPWPN_FLAMING:
            if (defender->is_fiery())
                susceptible = false;
            break;
        case SPWPN_FREEZING:
            if (defender->is_icy())
                susceptible = false;
            break;
        case SPWPN_ELECTROCUTION:
            if (defender->airborne())
                susceptible = false;
            break;
        case SPWPN_VENOM:
            if (defender->holiness() == MH_UNDEAD)
                susceptible = false;
            break;
        case SPWPN_DRAINING:
        case SPWPN_VAMPIRICISM:
            if (defender->holiness() != MH_NATURAL)
                susceptible = false;
            break;
        case SPWPN_HOLY_WRATH:
            if (defender->holiness() != MH_UNDEAD
                && defender->holiness() != MH_DEMONIC)
            {
                susceptible = false;
            }
            break;
        case SPWPN_CONFUSE:
            if (defender->holiness() != MH_NONLIVING
                && defender->holiness() != MH_PLANT)
            {
                susceptible = false;
            }
            break;
        default:
            break;
        }
        if (susceptible)
            break;
    }
    return (brand);

Insertion in crawl-ref/source/externs.h at line 328 [13.3270163]
[41.2293]
[42.82288]
```
    virtual bool is_fiery() const = 0;
```
Insertion in crawl-ref/source/externs.h at line 995 [13.3270163]
[16.498]
[43.3502]
```
    bool is_fiery() const;
```
Insertion in crawl-ref/source/externs.h at line 1485 [13.3270163]
[16.524]
[44.88964]
```
    bool is_fiery() const;
```

Replacement in crawl-ref/source/enum.h at line 1452 [13.3287960]

B:BD[2.2582] → [2.2582:2884]

enum KeymapContext {
    KC_DEFAULT,         // For no-arg getchm(), must be zero.
    KC_LEVELMAP,        // When in the 'X' level map
    KC_TARGETING,       // Only during 'x' and other targeting modes
    KC_CONFIRM,         // When being asked y/n/q questions
    KC_MENU,            // For menus

[2.2582]

[2.2884]

enum KeymapContext
{
    KMC_DEFAULT,         // For no-arg getchm(), must be zero.
    KMC_LEVELMAP,        // When in the 'X' level map
    KMC_TARGETING,       // Only during 'x' and other targeting modes
    KMC_CONFIRM,         // When being asked y/n/q questions
    KMC_MENU,            // For menus

Replacement in crawl-ref/source/enum.h at line 1461 [13.3287960]

B:BD[2.2901] → [2.2901:2954]

    KC_TILE,            // For context_for_command()

[2.2901]

[2.2954]

    KMC_TILE,            // For context_for_command()

Replacement in crawl-ref/source/enum.h at line 1464 [13.3287960]

B:BD[2.2962] → [2.2962:3026]

    KC_CONTEXT_COUNT,   // Must always be the last real context

[2.2962]

[2.3026]

    KMC_CONTEXT_COUNT,   // Must always be the last real context

Replacement in crawl-ref/source/enum.h at line 1466 [13.3287960]
B:BD[2.3027] → [2.3027:3039]
```
    KC_NONE
```
[2.3027]
[10.449352]
```
    KMC_NONE
```
Insertion in crawl-ref/source/delay.h at line 81 [13.3962990]
[12.1469]
[38.3995]
```
void maybe_clear_weapon_swap();
```

Insertion in crawl-ref/source/delay.cc at line 548 [13.3963459]

[5.5336]

[38.4589]

}
void maybe_clear_weapon_swap()
{
    if (transformation_can_wield(static_cast<transformation_type>(
                                    you.attribute[ATTR_TRANSFORMATION])))
    {
        you.attribute[ATTR_WEAPON_SWAP_INTERRUPTED] = 0;
    }

Replacement in crawl-ref/source/delay.cc at line 1980 [13.3963459]

B:BD[15.1015688] → [45.17822:17928]

        // no monster will attack you inside a sanctuary,
        // so presence of monsters won't matter

[15.1015688]

[19.51779]

        // No monster will attack you inside a sanctuary,
        // so presence of monsters won't matter.

Replacement in crawl-ref/source/delay.cc at line 2009 [13.3963459]

B:BD[13.3980587] → [38.7909:8053]

                    was_monst =
                        _monster_warning(ai, at, you.delay_queue[j].type)
                        || was_monst;

[13.3980587]

[38.8053]

                    was_monst = was_monst ||
                            _monster_warning(ai, at, you.delay_queue[j].type);

Replacement in crawl-ref/source/debug.cc at line 5167 [13.4016436]
B:BD[46.37957] → [46.37957:38000]
```
    char type = (char) getchm(KC_DEFAULT);
```
[46.37957]
[46.38000]
```
    char type = (char) getchm(KMC_DEFAULT);
```
Replacement in crawl-ref/source/debug.cc at line 5231 [13.4016436]
B:BD[47.11952] → [47.11952:11995]
```
    char type = (char) getchm(KC_DEFAULT);
```
[47.11952]
[47.11995]
```
    char type = (char) getchm(KMC_DEFAULT);
```

Replacement in crawl-ref/source/cio.h at line 55 [48.10469]

B:BD[48.11359] → [2.3348:3422]

int unmangle_direction_keys(int keyin, KeymapContext keymap = KC_DEFAULT,

[48.11359]

[48.11414]

int unmangle_direction_keys(int keyin, KeymapContext keymap = KMC_DEFAULT,

Replacement in crawl-ref/source/arena.cc at line 706 [49.10815]

B:BD[4.4515] → [4.4515:4580]

        const command_type cmd = key_to_command(ch, KC_DEFAULT);

[4.4515]

[4.4580]

        const command_type cmd = key_to_command(ch, KMC_DEFAULT);

Replacement in crawl-ref/source/acr.cc at line 1454 [13.4397395]
B:BD[50.5732] → [50.5732:5779]
```
        char type = (char) getchm(KC_DEFAULT);
```
[50.5732]
[50.5779]
```
        char type = (char) getchm(KMC_DEFAULT);
```
Replacement in crawl-ref/source/acr.cc at line 2888 [13.4397395]
B:BD[24.25406] → [24.25406:25454]
```
        return key_to_command(key, KC_DEFAULT);
```
[24.25406]
[15.1277613]
```
        return key_to_command(key, KMC_DEFAULT);
```

* Fix 2744875 (mutation screen assert).

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/xom.cc at line 503 [9.3]

Replacement in crawl-ref/source/xom.cc at line 511 [9.3]

Replacement in crawl-ref/source/travel.cc at line 2565 [10.39949]

Replacement in crawl-ref/source/travel.cc at line 2980 [10.39949]

Insertion in crawl-ref/source/transfor.h at line 31 [13.142596]

Replacement in crawl-ref/source/stuff.cc at line 1057 [13.224557]

Replacement in crawl-ref/source/stuff.cc at line 1158 [13.224557]

Insertion in crawl-ref/source/player.cc at line 7170 [13.962854]

Insertion in crawl-ref/source/player.cc at line 7516 [13.962854]

Deletion in crawl-ref/source/player.cc at line 7521 [13.962854]

Deletion in crawl-ref/source/player.cc at line 7522 [13.962854]

Insertion in crawl-ref/source/mutation.cc at line 1533 [13.1263003]

Replacement in crawl-ref/source/mutation.cc at line 1628 [13.1263003]

Insertion in crawl-ref/source/mon-util.cc at line 7679 [13.1699344]

Insertion in crawl-ref/source/mon-util.cc at line 7696 [13.1699344]

Replacement in crawl-ref/source/menu.cc at line 96 [10.261322]

Replacement in crawl-ref/source/menu.cc at line 115 [10.261322]

Replacement in crawl-ref/source/macro.cc at line 56 [13.2457534]

Replacement in crawl-ref/source/macro.cc at line 61 [13.2457534]

Replacement in crawl-ref/source/macro.cc at line 67 [13.2457534]

Replacement in crawl-ref/source/macro.cc at line 109 [13.2457534]

Replacement in crawl-ref/source/macro.cc at line 461 [13.2457534]

Replacement in crawl-ref/source/macro.cc at line 613 [13.2457534]

Replacement in crawl-ref/source/macro.cc at line 667 [13.2457534]

Replacement in crawl-ref/source/macro.cc at line 680 [13.2457534]

Replacement in crawl-ref/source/macro.cc at line 750 [13.2457534]

Replacement in crawl-ref/source/macro.cc at line 762 [13.2457534]

Replacement in crawl-ref/source/macro.cc at line 767 [13.2457534]

Replacement in crawl-ref/source/macro.cc at line 772 [13.2457534]

Replacement in crawl-ref/source/macro.cc at line 777 [13.2457534]

Replacement in crawl-ref/source/macro.cc at line 782 [13.2457534]

Replacement in crawl-ref/source/macro.cc at line 802 [13.2457534]

Replacement in crawl-ref/source/macro.cc at line 868 [13.2457534]

Replacement in crawl-ref/source/macro.cc at line 882 [13.2457534]

Replacement in crawl-ref/source/macro.cc at line 886 [13.2457534]

Replacement in crawl-ref/source/macro.cc at line 1068 [13.2457534]

Replacement in crawl-ref/source/macro.cc at line 1123 [13.2457534]

Replacement in crawl-ref/source/macro.cc at line 1139 [13.2457534]

Replacement in crawl-ref/source/macro.cc at line 1143 [13.2457534]

Replacement in crawl-ref/source/macro.cc at line 1146 [13.2457534]

Replacement in crawl-ref/source/macro.cc at line 1149 [13.2457534]

Replacement in crawl-ref/source/macro.cc at line 1151 [13.2457534]

Replacement in crawl-ref/source/macro.cc at line 1159 [13.2457534]

Replacement in crawl-ref/source/item_use.cc at line 4913 [13.2781507]

Replacement in crawl-ref/source/food.cc at line 627 [13.3043806]

Replacement in crawl-ref/source/food.cc at line 1296 [13.3043806]

Replacement in crawl-ref/source/food.cc at line 1448 [13.3043806]

Replacement in crawl-ref/source/food.cc at line 1610 [13.3043806]

Replacement in crawl-ref/source/files.cc at line 1399 [13.3084589]

Insertion in crawl-ref/source/fight.cc at line 27 [13.3140790]

Replacement in crawl-ref/source/fight.cc at line 497 [13.3140790]

Replacement in crawl-ref/source/fight.cc at line 499 [13.3140790]

Replacement in crawl-ref/source/fight.cc at line 2263 [13.3140790]

Replacement in crawl-ref/source/fight.cc at line 2332 [13.3140790]

Replacement in crawl-ref/source/fight.cc at line 2393 [13.3140790]

Insertion in crawl-ref/source/fight.cc at line 2400 [13.3140790]

Deletion in crawl-ref/source/fight.cc at line 2409 [13.3140790]

Replacement in crawl-ref/source/fight.cc at line 2434 [13.3140790]

Insertion in crawl-ref/source/fight.cc at line 2537 [13.3140790]

Replacement in crawl-ref/source/fight.cc at line 2551 [13.3140790]

Replacement in crawl-ref/source/fight.cc at line 2553 [13.3140790]

Replacement in crawl-ref/source/fight.cc at line 2555 [13.3140790]

Replacement in crawl-ref/source/fight.cc at line 2571 [13.3140790]

Deletion in crawl-ref/source/fight.cc at line 2578 [13.3140790]

Replacement in crawl-ref/source/fight.cc at line 2806 [13.3140790]

Insertion in crawl-ref/source/externs.h at line 328 [13.3270163]

Insertion in crawl-ref/source/externs.h at line 995 [13.3270163]

Insertion in crawl-ref/source/externs.h at line 1485 [13.3270163]