fiddlerwoaroof/crawl - Change J6TNHG7436SDYKZEGAGZ3U7LW2ZOV6OTOWHHSNBFOSNDL6HOZYBAC

* Call message flush before entering a shop.

Indent shopping commands correctly.

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

Created by j-p-e-g on March 13, 2009

J6TNHG7436SDYKZEGAGZ3U7LW2ZOV6OTOWHHSNBFOSNDL6HOZYBAC

Dependencies

In channels

main

Change contents

Deletion in crawl-ref/source/tilepick.cc at line 2447 [5.96318]

B:BD[5.151443] → [5.151443:151539]

    case DNGN_ENTER_RESERVED_2:
    case DNGN_ENTER_RESERVED_3:
    case DNGN_ENTER_RESERVED_4:

Deletion in crawl-ref/source/tilepick.cc at line 2462 [5.96318]

B:BD[5.152066] → [5.152066:152165]

    case DNGN_RETURN_RESERVED_2:
    case DNGN_RETURN_RESERVED_3:
    case DNGN_RETURN_RESERVED_4:

Deletion in crawl-ref/source/tile2.cc at line 179 [5.13289]
B:BD[5.46255] → [6.15314:15389]
```
    case BRANCH_INFERNO:
    case BRANCH_THE_PIT:
    case BRANCH_CAVERNS:
```

Deletion in crawl-ref/source/shopping.cc at line 123 [8.759950]

B:BD[7.167587] → [4.1614:1697]

            "[<w>?</w>/<w>*</w>]           Inventory  [<w>\\</w>] Known Items    "

Insertion in crawl-ref/source/shopping.cc at line 124 [8.759950]

[4.1713]

            "[<w>?</w>/<w>*</w>]           Inventory  [<w>\\</w>] Known Items    "

Insertion in crawl-ref/source/shopping.cc at line 127 [8.759950]

[4.1779]

            "[<w>?</w>/<w>*</w>]   Inventory  [<w>\\</w>] Known Items    "

Deletion in crawl-ref/source/shopping.cc at line 1746 [8.759950]
B:BD[9.5575] → [9.5575:5600]
```
//    env.shop.erase(i);
```
Insertion in crawl-ref/source/shopping.cc at line 1751 [8.759950]
[8.797565]
[10.3682]
```
    flush_prev_message();
```

Replacement in crawl-ref/source/place.cc at line 159 [11.51817]

B:BD[11.55705] → [11.55705:55777]

    if (branch >= BRANCH_VESTIBULE_OF_HELL && branch <= BRANCH_THE_PIT)

[11.55705]

[11.55777]

    if (branch >= BRANCH_VESTIBULE_OF_HELL && branch <= BRANCH_LAST_HELL)

Replacement in crawl-ref/source/monstuff.cc at line 1892 [8.1396662]

∅:D[12.277] → [13.355:443]

B:BD[13.355] → [13.355:443]

B:BD[13.443] → [2.2597:2639]

        || new_mclass == MONS_ORANGE_STATUE
        || new_mclass == MONS_SILVER_STATUE
        || new_mclass == MONS_ICE_STATUE)

[12.277]

[8.1424367]

        || mons_is_statue(new_mclass))

Replacement in crawl-ref/source/monstuff.cc at line 4647 [8.1396662]

B:BD[14.4367] → [14.4367:4498]

            const bool ranged =
                mons_has_ranged_attack(monster)
                || mons_has_ranged_spell(monster);

[14.4367]

[14.4498]

            const bool ranged = (mons_has_ranged_attack(monster)
                                 || mons_has_ranged_spell(monster));

Replacement in crawl-ref/source/monstuff.cc at line 4657 [8.1396662]

B:BD[14.4842] → [14.4842:4946]

                && (!ranged ||
                    !monster->mon_see_grid(monster->target, !glass_ok)))

[14.4842]

[14.4946]

                && (!ranged
                    || !monster->mon_see_grid(monster->target, !glass_ok)))

Replacement in crawl-ref/source/delay.cc at line 1338 [8.3963459]

B:BD[15.9144] → [15.9144:9213]

        // these are simple delays that have no effect when complete

[15.9144]

[15.9213]

        // These are simple delays that have no effect when complete.

Insertion in crawl-ref/source/command.cc at line 2059 [8.4082507]
[16.2833]
[16.2833]
```
        "\n"
```

Replacement in crawl-ref/source/command.cc at line 2172 [8.4082507]

B:BD[17.6797] → [17.6797:6853]

            "<w>'</w> : wield item a, or switch to b\n"

[17.6797]

[18.3096]

            "<w>'</w> : wield item a, or switch to b \n"
            "    (use <w>=</w> to assign slots)\n"

Replacement in crawl-ref/source/command.cc at line 2185 [8.4082507]
B:BD[7.1194366] → [7.1194366:1194418]
```
            "    (press twice for pick up menu) \n"
```
[7.1194366]
[7.1194418]
```
            "    (press twice for pick up menu)\n"
```

Replacement in crawl-ref/source/command.cc at line 2187 [8.4082507]

B:BD[7.1194458] → [7.1194458:1194513]

B:BD[7.1194513] → [3.3094:3138]

            "<w>d#</w>: Drop exact number of items \n"
            "<w>c</w> : Chop up a corpse ";

[7.1194458]

[3.3138]

            "<w>d#</w>: Drop exact number of items\n"
            "<w>c</w> : Chop up a corpse";

Replacement in crawl-ref/source/command.cc at line 2191 [8.4082507]
B:BD[3.3197] → [3.3197:3241]
```
        interact += "or bottle its blood ";
```
[3.3197]
[3.3241]
```
        interact += " or bottle its blood";
```

Replacement in crawl-ref/source/command.cc at line 2194 [8.4082507]

B:BD[3.3258] → [3.3258:3309]

            "\n<w>e</w> : Eat food from floor \n";

[3.3258]

[3.3309]

            "\n"
            "<w>e</w> : Eat food from floor\n";