fiddlerwoaroof/crawl - Change 4S7GTHOCXO5MLS3DKSZWUYYZFBVNHDG6RFJONUALXVA7CCPFKXKAC

* Fix non-prompting when firing through allies.

Don't autopickup chunks if starving. (Yes, I died because of that. Xom was very much amused…)
Some spacing fixes.

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

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

4S7GTHOCXO5MLS3DKSZWUYYZFBVNHDG6RFJONUALXVA7CCPFKXKAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/xom.cc at line 289 [8.3]
B:BD[7.1887] → [7.1887:1904]
```
#ifdef DEBUG_XOM
```
[7.1887]
[7.1904]
```
#ifdef DEBUG_DIAGNOSTICS
```

Replacement in crawl-ref/source/spells3.cc at line 928 [10.531613]

B:BD[9.1103] → [9.1103:1178]

                    mpr("The corpse you are butchering rises to attack!");

[9.1103]

[11.9007]

                {
                    if (beha == BEH_HOSTILE)
                        mpr("The corpse you are butchering rises to attack!");
                    else
                    {
                        mpr("The corpse you are butchering rises to join "
                            "your ranks!");
                    }
                }

Insertion in crawl-ref/source/mon-util.cc at line 4499 [10.1699344]
[12.6757]
[12.6757]
```
        {
```
Insertion in crawl-ref/source/mon-util.cc at line 4502 [10.1699344]
[4.3238]
[12.6869]
```
        }
```

Insertion in crawl-ref/source/item_use.cc at line 2363 [10.2781507]

[13.5083]

        // Set values absurdly high to make sure the tracer will
        // complain if we're attempting to fire through allies.
        pbolt.hit    = 100;
        pbolt.damage = dice_def(1, 100);

Insertion in crawl-ref/source/item_use.cc at line 2386 [10.2781507]
[13.5621]
[14.5492]
```
        pbolt.hit    = 0;
        pbolt.damage = dice_def();
```
Deletion in crawl-ref/source/directn.cc at line 525 [10.3697945]
B:BD[15.5170] → [6.3936:3975]
```
//    desc_menu.set_highlighter(NULL);
```

Insertion in crawl-ref/source/delay.cc at line 1295 [10.3963459]

[16.10402]

            // Also, don't waste time picking up chunks if you're already
            // starving. (jpeg)

Replacement in crawl-ref/source/delay.cc at line 1301 [10.3963459]

B:BD[16.10564] → [16.10564:10594]

                autopickup();

[16.10564]

[17.1903]

                if (you.hunger_state > HS_STARVING || you.species == SP_VAMPIRE)
                    autopickup();

Replacement in crawl-ref/source/delay.cc at line 1308 [10.3963459]

B:BD[18.7091] → [18.7091:7136]

            if (you.delay_queue.size() == 1)

[18.7091]

[18.7136]

            // Again, not if starving. (jpeg)
            if (you.delay_queue.size() == 1
                && (you.hunger_state > HS_STARVING
                    || you.species == SP_VAMPIRE))
            {

Insertion in crawl-ref/source/delay.cc at line 1314 [10.3963459]
[18.7183]
[17.1917]
```
            }
```
Deletion in crawl-ref/source/beam.h at line 271 [10.4124541]
B:BD[10.4125144] → [19.8963:8985]
∅:D[19.8985] → [20.3042:3236]
B:BD[10.4125698] → [20.3042:3236]
B:BD[20.3236] → [21.3867:3956]
B:BD[21.3956] → [19.8986:8989]
∅:D[22.903] → [10.4125770:4125771]
∅:D[23.3170] → [10.4125770:4125771]
∅:D[20.3281] → [10.4125770:4125771]
∅:D[21.3956] → [10.4125770:4125771]
∅:D[19.8989] → [10.4125770:4125771]
B:BD[10.4125770] → [10.4125770:4125771]
```
/* FIXME: remove this
int explosion( bolt &pbolt, bool hole_in_the_middle = false,
               bool explode_in_wall = false,
               bool stop_at_statues = true,
               bool stop_at_walls   = true,
               bool show_more       = true,
               bool affect_items    = true);
*/
```
Deletion in crawl-ref/source/beam.cc at line 192 [10.4128068]
B:BD[10.4131517] → [10.4131517:4131518]

Replacement in crawl-ref/source/beam.cc at line 1399 [10.4128068]

B:BD[24.2968] → [24.2968:3016]

			              (int)(max * 10000)) / 10000.0;

[24.2968]

[25.2922]

                                      (int)(max * 10000)) / 10000.0;

Insertion in crawl-ref/source/beam.cc at line 1479 [10.4128068]
[26.4161]
[26.4161]
Deletion in crawl-ref/source/beam.cc at line 1482 [10.4128068]
B:BD[26.4269] → [26.4269:4279]
```
        {
```
Deletion in crawl-ref/source/beam.cc at line 1483 [10.4128068]
B:BD[26.4315] → [26.4315:4325]
```
        }
```
Replacement in crawl-ref/source/beam.cc at line 1533 [10.4128068]
∅:D[3.3031] → [19.11224:11246]
∅:D[27.3166] → [19.11224:11246]
B:BD[28.7930] → [19.11224:11246]
```
#if DEBUG_DIAGNOSTICS
```
[3.3031]
[19.11246]
```
#ifdef DEBUG_DIAGNOSTICS
```

Replacement in crawl-ref/source/beam.cc at line 1604 [10.4128068]

B:BD[19.12792] → [19.12792:12918]

            put_colour_ch(
                colour == BLACK ? random_colour() : element_colour(colour),
                type);

[19.12792]

[10.4170521]

            put_colour_ch(colour == BLACK ? random_colour()
                                          : element_colour(colour),
                          type);

Replacement in crawl-ref/source/beam.cc at line 1621 [10.4128068]
B:BD[29.202] → [19.13157:13170]
```
        do {
```
[29.202]
[19.13170]
```
        do
```
Replacement in crawl-ref/source/beam.cc at line 1623 [10.4128068]
B:BD[19.13197] → [19.13197:13246]
```
        } while (grid_is_solid(grd(ray.pos())));
```
[19.13197]
[19.13246]
```
        while (grid_is_solid(grd(ray.pos())));
```

Replacement in crawl-ref/source/beam.cc at line 1628 [10.4128068]

B:BD[19.13337] → [19.13337:13404]

    } while (range_used < range && grid_is_solid(grd(ray.pos())));

[19.13337]

[10.4170794]

    }
    while (range_used < range && grid_is_solid(grd(ray.pos())));

Replacement in crawl-ref/source/beam.cc at line 1806 [10.4128068]
B:BD[30.7026] → [19.17955:17972]
```
            do {
```
[30.7026]
[19.17972]
```
            do
```

Replacement in crawl-ref/source/beam.cc at line 1808 [10.4128068]

B:BD[19.18003] → [25.3781:3852]

            } while (ray.pos() != source && grid_is_solid(ray.pos()));

[19.18003]

[31.2745]

            while (ray.pos() != source && grid_is_solid(ray.pos()));

Replacement in crawl-ref/source/beam.cc at line 1866 [10.4128068]
B:BD[32.21838] → [32.21838:21894]
```
    for (unsigned int i = 0; i < hit_funcs.size(); i++)
```
[32.21838]
[32.21894]
```
    for (unsigned int i = 0; i < hit_funcs.size(); ++i)
```
Insertion in crawl-ref/source/beam.cc at line 1868 [10.4128068]
[32.21970]
[32.21970]

Replacement in crawl-ref/source/beam.cc at line 1875 [10.4128068]

B:BD[32.22111] → [32.22111:22170]

    for (unsigned int i = 0; i < damage_funcs.size(); i++)

[32.22111]

[32.22170]

    for (unsigned int i = 0; i < damage_funcs.size(); ++i)

Replacement in crawl-ref/source/beam.cc at line 2454 [10.4128068]
B:BD[10.4187193] → [33.3986:4029]
```
    for (int i = 0; i < MAX_MONSTERS; i++)
```
[10.4187193]
[10.4187232]
```
    for (int i = 0; i < MAX_MONSTERS; ++i)
```
Replacement in crawl-ref/source/beam.cc at line 2723 [10.4128068]
B:BD[34.8212] → [35.8705:8736]
```
        && you.can_see(mimic);
```
[34.8212]
[34.8287]
```
                     && you.can_see(mimic);
```

Replacement in crawl-ref/source/beam.cc at line 3112 [10.4128068]

B:BD[36.3137] → [19.30975:31046]

                whose_kill() == KC_OTHER ? BEH_HOSTILE : BEH_FRIENDLY;

[36.3137]

[37.2745]

                (whose_kill() == KC_OTHER ? BEH_HOSTILE : BEH_FRIENDLY);

Replacement in crawl-ref/source/beam.cc at line 3389 [10.4128068]
B:BD[32.23906] → [32.23906:23961]
```
    for (unsigned int i = 0; i < messages.size(); i++)
```
[32.23906]
[32.23961]
```
    for (unsigned int i = 0; i < messages.size(); ++i)
```
Replacement in crawl-ref/source/beam.cc at line 3680 [10.4128068]
B:BD[10.4229842] → [19.41581:41613]
```
        mpr( "You convulse!" );
```
[10.4229842]
[10.4229878]
```
        mpr("You convulse!");
```

Replacement in crawl-ref/source/beam.cc at line 3957 [10.4128068]

B:BD[32.24481] → [32.24481:24540]

        for (unsigned int i = 0; i < messages.size(); i++)

[32.24481]

[32.24540]

        for (unsigned int i = 0; i < messages.size(); ++i)

Replacement in crawl-ref/source/beam.cc at line 4053 [10.4128068]
B:BD[19.46379] → [19.46379:46405]
```
            return false;
```
[19.46379]
[38.3046]
```
            return (false);
```
Replacement in crawl-ref/source/beam.cc at line 4061 [10.4128068]
B:BD[19.46652] → [19.46652:46678]
```
            return false;
```
[19.46652]
[39.2763]
```
            return (false);
```

Replacement in crawl-ref/source/beam.cc at line 4090 [10.4128068]

B:BD[40.1246988] → [41.5730:5854]

        if ((friend_info.count == 1 && !friend_info.dont_stop)
            || (foe_info.count == 1 && !foe_info.dont_stop))

[40.1246988]

[40.1247033]

        if (friend_info.count == 1 && !friend_info.dont_stop
            || foe_info.count == 1 && !foe_info.dont_stop)

Replacement in crawl-ref/source/beam.cc at line 4114 [10.4128068]

B:BD[19.47931] → [32.24993:25057]

    if ( !determine_damage(mon, preac, post, final, messages) )

[19.47931]

[19.47985]

    if (!determine_damage(mon, preac, post, final, messages))

Deletion in crawl-ref/source/beam.cc at line 4117 [10.4128068]

B:BD[10.4234671] → [19.48002:48131]

B:BD[19.48131] → [38.3108:3109]

    // Maybe the user wants to cancel at this point.
    handle_stop_attack_prompt(mon);
    if (beam_cancelled)
        return;

Insertion in crawl-ref/source/beam.cc at line 4137 [10.4128068]
[42.4425]
[32.25058]
```
    }
```

Replacement in crawl-ref/source/beam.cc at line 4139 [10.4128068]

B:BD[32.25059] → [32.25059:25118]

        for (unsigned int i = 0; i < messages.size(); i++)

[32.25059]

[32.25118]

    // Maybe the user wants to cancel at this point.
    handle_stop_attack_prompt(mon);
    if (beam_cancelled)
        return;
    // Check only if actual damage.
    if (final > 0)
    {
        for (unsigned int i = 0; i < messages.size(); ++i)

Replacement in crawl-ref/source/beam.cc at line 4551 [10.4128068]

B:BD[32.25872] → [32.25872:25931]

        for (unsigned int i = 0; i < messages.size(); i++)

[32.25872]

[32.25931]

        for (unsigned int i = 0; i < messages.size(); ++i)

Replacement in crawl-ref/source/beam.cc at line 5020 [10.4128068]
B:BD[10.4249263] → [32.27017:27075]
```
    for (unsigned int i = 0; i < range_funcs.size(); i++)
```
[10.4249263]
[32.27075]
```
    for (unsigned int i = 0; i < range_funcs.size(); ++i)
```

Replacement in crawl-ref/source/beam.cc at line 5152 [10.4128068]

B:BD[43.40889] → [2.2846:2899]

        hearMsg = "You hear the sound of one hand!";

[43.40889]

[10.4252546]

        hearMsg = "You hear the sound of one hand clapping!";

Replacement in crawl-ref/source/beam.cc at line 5329 [10.4128068]

B:BD[19.70753] → [19.70753:70887]

            put_colour_ch(
                colour == BLACK ? random_colour() : colour,
                dchar_glyph(DCHAR_EXPLOSION));

[19.70753]

[19.70887]

            put_colour_ch(colour == BLACK ? random_colour() : colour,
                          dchar_glyph(DCHAR_EXPLOSION));

Replacement in crawl-ref/source/beam.cc at line 5389 [10.4128068]
∅:D[44.3275] → [45.2752:2784]
B:BD[46.22521] → [45.2752:2784]
```
    for (int i = 0; i < 8; i++)
```
[44.3275]
[10.4258711]
```
    for (int i = 0; i < 8; ++i)
```

Replacement in crawl-ref/source/beam.cc at line 5622 [10.4128068]

B:BD[30.8486] → [30.8486:8613]

    case BEAM_NONE: return("none");
    case BEAM_MISSILE: return("missile");
    case BEAM_MMISSILE: return("magic missile");

[30.8486]

[30.8613]

    case BEAM_NONE:                 return("none");
    case BEAM_MISSILE:              return("missile");
    case BEAM_MMISSILE:             return("magic missile");

Replacement in crawl-ref/source/beam.cc at line 5626 [10.4128068]

B:BD[30.8614] → [30.8614:8677]

    case BEAM_POTION_FIRE:
    case BEAM_FIRE: return("fire");

[30.8614]

[30.8677]

    case BEAM_POTION_FIRE:          // fall through
    case BEAM_FIRE:                 return("fire");

Replacement in crawl-ref/source/beam.cc at line 5629 [10.4128068]

B:BD[30.8678] → [30.8678:8741]

    case BEAM_POTION_COLD:
    case BEAM_COLD: return("cold");

[30.8678]

[30.8741]

    case BEAM_POTION_COLD:          // fall through
    case BEAM_COLD:                 return("cold");

Replacement in crawl-ref/source/beam.cc at line 5632 [10.4128068]

B:BD[30.8742] → [30.8742:8830]

    case BEAM_MAGIC: return("magic");
    case BEAM_ELECTRICITY: return("electricity");

[30.8742]

[30.8830]

    case BEAM_MAGIC:                return("magic");
    case BEAM_ELECTRICITY:          return("electricity");

Replacement in crawl-ref/source/beam.cc at line 5636 [10.4128068]

B:BD[30.8868] → [30.8868:8937]

    case BEAM_POTION_POISON:
    case BEAM_POISON: return("poison");

[30.8868]

[30.8937]

    case BEAM_POTION_POISON:        // fall through
    case BEAM_POISON:               return("poison");
    case BEAM_NEG:                  return("negative energy");
    case BEAM_ACID:                 return("acid");

Replacement in crawl-ref/source/beam.cc at line 5642 [10.4128068]

B:BD[30.8938] → [30.8938:9020]

    case BEAM_NEG: return("negative energy");
    case BEAM_ACID: return("acid");

[30.8938]

[30.9020]

    case BEAM_MIASMA:               // fall through
    case BEAM_POTION_MIASMA:        return("miasma");

Replacement in crawl-ref/source/beam.cc at line 5645 [10.4128068]

B:BD[30.9021] → [30.9021:9090]

    case BEAM_MIASMA:
    case BEAM_POTION_MIASMA: return("miasma");

[30.9021]

[30.9090]

    case BEAM_SPORE:                return("spores");
    case BEAM_POISON_ARROW:         return("poison arrow");
    case BEAM_HELLFIRE:             return("hellfire");
    case BEAM_NAPALM:               return("sticky fire");

Replacement in crawl-ref/source/beam.cc at line 5650 [10.4128068]

B:BD[30.9091] → [30.9091:9271]

    case BEAM_SPORE: return("spores");
    case BEAM_POISON_ARROW: return("poison arrow");
    case BEAM_HELLFIRE: return("hellfire");
    case BEAM_NAPALM: return("sticky fire");

[30.9091]

[30.9271]

    case BEAM_POTION_STEAM:         // fall through
    case BEAM_STEAM:                return("steam");

Replacement in crawl-ref/source/beam.cc at line 5653 [10.4128068]

B:BD[30.9272] → [30.9272:9338]

    case BEAM_POTION_STEAM:
    case BEAM_STEAM: return("steam");

[30.9272]

[30.9338]

    case BEAM_ENERGY:               return("energy");
    case BEAM_HOLY:                 return("holy energy");
    case BEAM_FRAG:                 return("fragments");
    case BEAM_LAVA:                 return("magma");
    case BEAM_ICE:                  return("ice");
    case BEAM_NUKE:                 return("nuke");
    case BEAM_RANDOM:               return("random");
    case BEAM_CHAOS:                return("chaos");
    case BEAM_SLOW:                 return("slow");
    case BEAM_HASTE:                return("haste");
    case BEAM_HEALING:              return("healing");
    case BEAM_PARALYSIS:            return("paralysis");
    case BEAM_CONFUSION:            return("confusion");
    case BEAM_INVISIBILITY:         return("invisibility");
    case BEAM_DIGGING:              return("digging");
    case BEAM_TELEPORT:             return("teleportation");
    case BEAM_POLYMORPH:            return("polymorph");
    case BEAM_CHARM:                return("enslave");
    case BEAM_BANISH:               return("banishment");
    case BEAM_DEGENERATE:           return("degeneration");
    case BEAM_ENSLAVE_UNDEAD:       return("enslave undead");
    case BEAM_ENSLAVE_SOUL:         return("enslave soul");
    case BEAM_PAIN:                 return("pain");
    case BEAM_DISPEL_UNDEAD:        return("dispel undead");
    case BEAM_DISINTEGRATION:       return("disintegration");
    case BEAM_ENSLAVE_DEMON:        return("enslave demon");
    case BEAM_BLINK:                return("blink");
    case BEAM_PETRIFY:              return("petrify");
    case BEAM_BACKLIGHT:            return("backlight");
    case BEAM_SLEEP:                return("sleep");
    case BEAM_POTION_BLACK_SMOKE:   return("black smoke");
    case BEAM_POTION_GREY_SMOKE:    return("grey smoke");
    case BEAM_POTION_BLUE_SMOKE:    return("blue smoke");
    case BEAM_POTION_PURP_SMOKE:    return("purple smoke");
    case BEAM_POTION_RANDOM:        return("random potion");
    case BEAM_VISUAL:               return ("visual effects");
    case BEAM_TORMENT_DAMAGE:       return("torment damage");
    case BEAM_STEAL_FOOD:           return("steal food");

Replacement in crawl-ref/source/beam.cc at line 5692 [10.4128068]

B:BD[30.9385] → [30.9385:9425]

B:BD[30.9425] → [47.3830:3873]

∅:D[47.3873] → [30.9467:10174]

B:BD[30.9467] → [30.9467:10174]

B:BD[30.10174] → [48.5627:5677]

∅:D[48.5677] → [30.10223:10477]

B:BD[30.10223] → [30.10223:10477]

B:BD[30.10477] → [48.5678:5732]

∅:D[48.5732] → [30.10531:10973]

B:BD[30.10531] → [30.10531:10973]

B:BD[30.10973] → [49.20079:20128]

∅:D[49.20128] → [30.10973:11077]

B:BD[30.10973] → [30.10973:11077]

B:BD[30.11131] → [30.11131:11217]

    case BEAM_ENERGY: return("energy");
    case BEAM_HOLY: return("holy energy");
    case BEAM_FRAG: return("fragments");
    case BEAM_LAVA: return("magma");
    case BEAM_ICE: return("ice");
    case BEAM_NUKE: return("nuke");
    case BEAM_RANDOM: return("random");
    case BEAM_CHAOS: return("chaos");
    case BEAM_SLOW: return("slow");
    case BEAM_HASTE: return("haste");
    case BEAM_HEALING: return("healing");
    case BEAM_PARALYSIS: return("paralysis");
    case BEAM_CONFUSION: return("confusion");
    case BEAM_INVISIBILITY: return("invisibility");
    case BEAM_DIGGING: return("digging");
    case BEAM_TELEPORT: return("teleportation");
    case BEAM_POLYMORPH: return("polymorph");
    case BEAM_CHARM: return("enslave");
    case BEAM_BANISH: return("banishment");
    case BEAM_DEGENERATE: return("degeneration");
    case BEAM_ENSLAVE_UNDEAD: return("enslave undead");
    case BEAM_ENSLAVE_SOUL: return("enslave soul");
    case BEAM_PAIN: return("pain");
    case BEAM_DISPEL_UNDEAD: return("dispel undead");
    case BEAM_DISINTEGRATION: return("disintegration");
    case BEAM_ENSLAVE_DEMON: return("enslave demon");
    case BEAM_BLINK: return("blink");
    case BEAM_PETRIFY: return("petrify");
    case BEAM_BACKLIGHT: return("backlight");
    case BEAM_SLEEP: return("sleep");
    case BEAM_POTION_BLACK_SMOKE: return("black smoke");
    case BEAM_POTION_GREY_SMOKE: return("grey smoke");
    case BEAM_POTION_BLUE_SMOKE: return("blue smoke");
    case BEAM_POTION_PURP_SMOKE: return("purple smoke");
    case BEAM_POTION_RANDOM: return("random potion");
    case BEAM_VISUAL: return ("visual effects");
    case BEAM_TORMENT_DAMAGE: return("torment damage");
    case BEAM_STEAL_FOOD: return("steal food");
    case NUM_BEAMS:
        DEBUGSTR("invalid beam type");
        return("INVALID");

[30.9339]

[30.11217]

    case NUM_BEAMS:                 DEBUGSTR("invalid beam type");
                                    return("INVALID");

Replacement in crawl-ref/source/acr.cc at line 321 [10.4397395]
B:BD[50.3198] → [50.3198:3239]
```
    for (int i = 0; i < NUM_SKILLS; i++)
```
[50.3198]
[50.3239]
```
    for (int i = 0; i < NUM_SKILLS; ++i)
```

Replacement in crawl-ref/source/acr.cc at line 595 [10.4397395]

B:BD[51.4111] → [51.4111:4178]

        mpr( "WARNING: ABOUT TO ENTER WIZARD MODE!", MSGCH_WARN );

[51.4111]

[51.4178]

        mpr("WARNING: ABOUT TO ENTER WIZARD MODE!", MSGCH_WARN);

Replacement in crawl-ref/source/acr.cc at line 598 [10.4397395]

B:BD[51.4205] → [51.4205:4282]

        mpr( "If you continue, your game will not be scored!", MSGCH_WARN );

[51.4205]

[51.4282]

        mpr("If you continue, your game will not be scored!", MSGCH_WARN);

Replacement in crawl-ref/source/acr.cc at line 617 [10.4397395]

B:BD[51.4727] → [51.4727:4789]

    mpr( "Enter Wizard Command (? - help): ", MSGCH_PROMPT );

[51.4727]

[51.4789]

    mpr("Enter Wizard Command (? - help): ", MSGCH_PROMPT);

Replacement in crawl-ref/source/acr.cc at line 1208 [10.4397395]

∅:D[52.5711] → [53.28306:28363]

B:BD[54.90382] → [53.28306:28363]

∅:D[53.28363] → [55.65160:65224]

B:BD[55.65160] → [55.65160:65224]

    bool shaft = (get_trap_type(you.pos()) == TRAP_SHAFT
                  && grd(you.pos()) != DNGN_UNDISCOVERED_TRAP);

[52.5711]

[56.3558]

    const bool shaft = (get_trap_type(you.pos()) == TRAP_SHAFT
                        && grd(you.pos()) != DNGN_UNDISCOVERED_TRAP);

Replacement in crawl-ref/source/acr.cc at line 1988 [10.4397395]

B:BD[57.6307] → [57.6307:6378]

// NOTE: The maximum possible midloss should be greater than midpoint,

[57.6307]

[57.6378]

// NOTE: The maximum possible midloss should be smaller than midpoint,

Replacement in crawl-ref/source/acr.cc at line 2013 [10.4397395]

B:BD[57.6771] → [57.6771:6834]

    // In case midloss caused the duration to end prematurely.

[57.6771]

[57.6834]

    // No "else", in case midloss caused the duration to end prematurely.

Replacement in crawl-ref/source/acr.cc at line 2481 [10.4397395]
B:BD[58.8564] → [58.8564:8604]
```
    for (int i = 0; i < MAX_TRAPS; i++)
```
[58.8564]
[58.8604]
```
    for (int i = 0; i < MAX_TRAPS; ++i)
```

Replacement in crawl-ref/source/acr.cc at line 2908 [10.4397395]

B:BD[59.3320] → [60.12566:12627]

    for ( adjacent_iterator ai(you.pos(), false); ai; ++ai )

[59.3320]

[59.3338]

    for (adjacent_iterator ai(you.pos(), false); ai; ++ai)

Replacement in crawl-ref/source/acr.cc at line 2910 [10.4397395]
B:BD[59.3344] → [60.12628:12660]
```
        if ( grd(*ai) == feat )
```
[59.3344]
[60.12660]
```
        if (grd(*ai) == feat)
```
Replacement in crawl-ref/source/acr.cc at line 3310 [10.4397395]
∅:D[61.4792] → [62.3075:3115]
B:BD[10.4469028] → [62.3075:3115]
```
    for (int i = 0; i < MAX_ITEMS; i++)
```
[61.4792]
[63.3941]
```
    for (int i = 0; i < MAX_ITEMS; ++i)
```
Replacement in crawl-ref/source/acr.cc at line 3316 [10.4397395]
B:BD[10.4469142] → [62.3116:3159]
```
    for (int i = 0; i < MAX_MONSTERS; i++)
```
[10.4469142]
[64.38357]
```
    for (int i = 0; i < MAX_MONSTERS; ++i)
```

Replacement in crawl-ref/source/acr.cc at line 3607 [10.4397395]

B:BD[65.3363] → [66.11884:11952]

        for (unsigned int i = 0; i < you.mesmerised_by.size(); i++)

[65.3363]

[67.11301]

        for (unsigned int i = 0; i < you.mesmerised_by.size(); ++i)

Replacement in crawl-ref/source/acr.cc at line 3708 [10.4397395]
B:BD[55.66948] → [55.66948:66992]
```
        for (int i = 0; i < MAX_ITEMS; i++)
```
[55.66948]
[55.66992]
```
        for (int i = 0; i < MAX_ITEMS; ++i)
```
Replacement in crawl-ref/source/acr.cc at line 3715 [10.4397395]
B:BD[55.67141] → [55.67141:67188]
```
        for (int i = 0; i < MAX_MONSTERS; i++)
```
[55.67141]
[55.67188]
```
        for (int i = 0; i < MAX_MONSTERS; ++i)
```
Replacement in crawl-ref/source/acr.cc at line 4071 [10.4397395]
B:BD[68.3275] → [69.66065:66108]
```
    for (int i = 0; i < NUM_BRANCHES; i++)
```
[68.3275]
[68.3320]
```
    for (int i = 0; i < NUM_BRANCHES; ++i)
```
Replacement in crawl-ref/source/abyss.cc at line 95 [10.4482606]
B:BD[10.4483318] → [60.13131:13178]
```
    for ( rectangle_iterator ri(5); ri; ++ri )
```
[10.4483318]
[60.13178]
```
    for (rectangle_iterator ri(5); ri; ++ri)
```

Replacement in crawl-ref/source/abyss.cc at line 215 [10.4482606]

B:BD[60.14304] → [60.14304:14375]

            for ( rectangle_iterator ri(tl, br); ri && room_ok; ++ri )

[60.14304]

[60.14375]

            for (rectangle_iterator ri(tl, br); ri && room_ok; ++ri)

Replacement in crawl-ref/source/abyss.cc at line 221 [10.4482606]

B:BD[70.14418] → [60.14489:14552]

                for ( rectangle_iterator ri(tl,br); ri; ++ri )

[70.14418]

[60.14552]

            {
                for (rectangle_iterator ri(tl,br); ri; ++ri)

Insertion in crawl-ref/source/abyss.cc at line 224 [10.4482606]
[60.14595]
[10.4486191]
```
            }
```

Replacement in crawl-ref/source/abyss.cc at line 237 [10.4482606]

B:BD[71.5263] → [60.14596:14662]

    for ( rectangle_iterator ri(topleft, bottomright); ri; ++ri )

[71.5263]

[60.14662]

    for (rectangle_iterator ri(topleft, bottomright); ri; ++ri)

Replacement in crawl-ref/source/abyss.cc at line 273 [10.4482606]

B:BD[72.28366] → [60.15650:15716]

    for ( rectangle_iterator ri(topleft, bottomright); ri; ++ri )

[72.28366]

[60.15716]

    for (rectangle_iterator ri(topleft, bottomright); ri; ++ri)

Replacement in crawl-ref/source/abyss.cc at line 454 [10.4482606]
B:BD[10.4488581] → [60.17104:17150]
```
    for (rectangle_iterator ri(5); ri; ++ri )
```
[10.4488581]
[60.17150]
```
    for (rectangle_iterator ri(5); ri; ++ri)
```

Replacement in crawl-ref/source/abyss.cc at line 514 [10.4482606]

B:BD[10.4490169] → [73.109224:109290]

        if ( grid_distance(abyss_center, env.cloud[i].pos) > 10 )

[10.4490169]

[10.4490293]

        if (grid_distance(abyss_center, env.cloud[i].pos) > 10)

Replacement in crawl-ref/source/abyss.cc at line 619 [10.4482606]
B:BD[10.4492483] → [60.18725:18773]
```
    for ( rectangle_iterator ri(10); ri; ++ri )
```
[10.4492483]
[60.18773]
```
    for (rectangle_iterator ri(10); ri; ++ri)
```
Replacement in crawl-ref/source/abyss.cc at line 873 [10.4482606]
∅:D[74.3098] → [60.19429:19488]
B:BD[60.19429] → [60.19429:19488]
```
    for ( rectangle_iterator ri(MAPGEN_BORDER); ri; ++ri )
```
[74.3098]
[60.19488]
```
    for (rectangle_iterator ri(MAPGEN_BORDER); ri; ++ri)
```

Replacement in crawl-ref/source/abl-show.cc at line 1618 [10.4494389]

B:BD[75.5327] → [75.5327:5408]

        case 4: beam.range = 8; zapping(ZAP_BREATHE_ACID, power/2, beam); break;

[75.5327]

[10.4524461]

        case 4: beam.range =  8; zapping(ZAP_BREATHE_ACID, power/2, beam); break;

Replacement in crawl-ref/source/abl-show.cc at line 1647 [10.4494389]

B:BD[75.5503] → [75.5503:5655]

            case 0: beam.range = 6;  ztype = ZAP_FIRE;               break;
            case 1: beam.range = 6;  ztype = ZAP_FIREBALL;           break;

[75.5503]

[75.5655]

            case 0: beam.range =  6; ztype = ZAP_FIRE;               break;
            case 1: beam.range =  6; ztype = ZAP_FIREBALL;           break;

Replacement in crawl-ref/source/abl-show.cc at line 1650 [10.4494389]

B:BD[75.5731] → [75.5731:5959]

            case 3: beam.range = 5;  ztype = ZAP_STICKY_FLAME;       break;
            case 4: beam.range = 5;  ztype = ZAP_IRON_BOLT;          break;
            case 5: beam.range = 6;  ztype = ZAP_NEGATIVE_ENERGY;    break;

[75.5731]

[75.5959]

            case 3: beam.range =  5; ztype = ZAP_STICKY_FLAME;       break;
            case 4: beam.range =  5; ztype = ZAP_IRON_BOLT;          break;
            case 5: beam.range =  6; ztype = ZAP_NEGATIVE_ENERGY;    break;

Replacement in crawl-ref/source/abl-show.cc at line 2056 [10.4494389]

B:BD[10.4536118] → [76.13677:13780]

     if (you.species == SP_DEEP_DWARF)
         _add_talent(talents, ABIL_RECHARGING, check_confused);

[10.4536118]

[76.13780]

    if (you.species == SP_DEEP_DWARF)
        _add_talent(talents, ABIL_RECHARGING, check_confused);

Replacement in crawl-ref/source/abl-show.cc at line 2405 [10.4494389]
B:BD[10.4550162] → [77.3474:3510]
```
    // Skip over a-e (invocations).
```
[10.4550162]
[5.7462]
```
    // Skip over a-e (invocations), or a-g for Elyvilon.
```
Replacement in crawl-ref/source/abl-show.cc at line 2407 [10.4494389]
B:BD[5.7529] → [5.7529:7580]
```
    for (int slot = first_slot; slot < 52; slot++)
```
[5.7529]
[78.3694]
```
    for (int slot = first_slot; slot < 52; ++slot)
```
Replacement in crawl-ref/source/abl-show.cc at line 2417 [10.4494389]
B:BD[79.43899] → [5.7581:7636]
```
    for (int slot = first_slot - 1; slot >= 0; slot--)
```
[79.43899]
[10.4551621]
```
    for (int slot = first_slot - 1; slot >= 0; --slot)
```

* Fix non-prompting when firing through allies.

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/xom.cc at line 289 [8.3]

Replacement in crawl-ref/source/spells3.cc at line 928 [10.531613]

Insertion in crawl-ref/source/mon-util.cc at line 4499 [10.1699344]

Insertion in crawl-ref/source/mon-util.cc at line 4502 [10.1699344]

Insertion in crawl-ref/source/item_use.cc at line 2363 [10.2781507]

Insertion in crawl-ref/source/item_use.cc at line 2386 [10.2781507]

Deletion in crawl-ref/source/directn.cc at line 525 [10.3697945]

Insertion in crawl-ref/source/delay.cc at line 1295 [10.3963459]

Replacement in crawl-ref/source/delay.cc at line 1301 [10.3963459]

Replacement in crawl-ref/source/delay.cc at line 1308 [10.3963459]

Insertion in crawl-ref/source/delay.cc at line 1314 [10.3963459]

Deletion in crawl-ref/source/beam.h at line 271 [10.4124541]

Deletion in crawl-ref/source/beam.cc at line 192 [10.4128068]

Replacement in crawl-ref/source/beam.cc at line 1399 [10.4128068]

Insertion in crawl-ref/source/beam.cc at line 1479 [10.4128068]

Deletion in crawl-ref/source/beam.cc at line 1482 [10.4128068]

Deletion in crawl-ref/source/beam.cc at line 1483 [10.4128068]

Replacement in crawl-ref/source/beam.cc at line 1533 [10.4128068]

Replacement in crawl-ref/source/beam.cc at line 1604 [10.4128068]

Replacement in crawl-ref/source/beam.cc at line 1621 [10.4128068]

Replacement in crawl-ref/source/beam.cc at line 1623 [10.4128068]

Replacement in crawl-ref/source/beam.cc at line 1628 [10.4128068]

Replacement in crawl-ref/source/beam.cc at line 1806 [10.4128068]

Replacement in crawl-ref/source/beam.cc at line 1808 [10.4128068]

Replacement in crawl-ref/source/beam.cc at line 1866 [10.4128068]

Insertion in crawl-ref/source/beam.cc at line 1868 [10.4128068]

Replacement in crawl-ref/source/beam.cc at line 1875 [10.4128068]

Replacement in crawl-ref/source/beam.cc at line 2454 [10.4128068]

Replacement in crawl-ref/source/beam.cc at line 2723 [10.4128068]

Replacement in crawl-ref/source/beam.cc at line 3112 [10.4128068]

Replacement in crawl-ref/source/beam.cc at line 3389 [10.4128068]

Replacement in crawl-ref/source/beam.cc at line 3680 [10.4128068]

Replacement in crawl-ref/source/beam.cc at line 3957 [10.4128068]

Replacement in crawl-ref/source/beam.cc at line 4053 [10.4128068]

Replacement in crawl-ref/source/beam.cc at line 4061 [10.4128068]

Replacement in crawl-ref/source/beam.cc at line 4090 [10.4128068]

Replacement in crawl-ref/source/beam.cc at line 4114 [10.4128068]

Deletion in crawl-ref/source/beam.cc at line 4117 [10.4128068]

Insertion in crawl-ref/source/beam.cc at line 4137 [10.4128068]

Replacement in crawl-ref/source/beam.cc at line 4139 [10.4128068]

Replacement in crawl-ref/source/beam.cc at line 4551 [10.4128068]

Replacement in crawl-ref/source/beam.cc at line 5020 [10.4128068]

Replacement in crawl-ref/source/beam.cc at line 5152 [10.4128068]

Replacement in crawl-ref/source/beam.cc at line 5329 [10.4128068]

Replacement in crawl-ref/source/beam.cc at line 5389 [10.4128068]

Replacement in crawl-ref/source/beam.cc at line 5622 [10.4128068]

Replacement in crawl-ref/source/beam.cc at line 5626 [10.4128068]

Replacement in crawl-ref/source/beam.cc at line 5629 [10.4128068]

Replacement in crawl-ref/source/beam.cc at line 5632 [10.4128068]

Replacement in crawl-ref/source/beam.cc at line 5636 [10.4128068]

Replacement in crawl-ref/source/beam.cc at line 5642 [10.4128068]

Replacement in crawl-ref/source/beam.cc at line 5645 [10.4128068]

Replacement in crawl-ref/source/beam.cc at line 5650 [10.4128068]

Replacement in crawl-ref/source/beam.cc at line 5653 [10.4128068]

Replacement in crawl-ref/source/beam.cc at line 5692 [10.4128068]

Replacement in crawl-ref/source/acr.cc at line 321 [10.4397395]

Replacement in crawl-ref/source/acr.cc at line 595 [10.4397395]

Replacement in crawl-ref/source/acr.cc at line 598 [10.4397395]

Replacement in crawl-ref/source/acr.cc at line 617 [10.4397395]

Replacement in crawl-ref/source/acr.cc at line 1208 [10.4397395]

Replacement in crawl-ref/source/acr.cc at line 1988 [10.4397395]

Replacement in crawl-ref/source/acr.cc at line 2013 [10.4397395]

Replacement in crawl-ref/source/acr.cc at line 2481 [10.4397395]

Replacement in crawl-ref/source/acr.cc at line 2908 [10.4397395]

Replacement in crawl-ref/source/acr.cc at line 2910 [10.4397395]

Replacement in crawl-ref/source/acr.cc at line 3310 [10.4397395]

Replacement in crawl-ref/source/acr.cc at line 3316 [10.4397395]

Replacement in crawl-ref/source/acr.cc at line 3607 [10.4397395]

Replacement in crawl-ref/source/acr.cc at line 3708 [10.4397395]

Replacement in crawl-ref/source/acr.cc at line 3715 [10.4397395]

Replacement in crawl-ref/source/acr.cc at line 4071 [10.4397395]

Replacement in crawl-ref/source/abyss.cc at line 95 [10.4482606]

Replacement in crawl-ref/source/abyss.cc at line 215 [10.4482606]

Replacement in crawl-ref/source/abyss.cc at line 221 [10.4482606]

Insertion in crawl-ref/source/abyss.cc at line 224 [10.4482606]

Replacement in crawl-ref/source/abyss.cc at line 237 [10.4482606]