fiddlerwoaroof/crawl - Change L57WEZMVIHTFRLWVIPWOIOWHCF2I53TVUVYJ2V6IZ64R56FVTZZAC

Fix 1948131: Quiver slot name wraps around the screen.

Also fixes tile issues where the inventory was partly covered or not shown at all.

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

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

L57WEZMVIHTFRLWVIPWOIOWHCF2I53TVUVYJ2V6IZ64R56FVTZZAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/view.cc at line 2673 [11.16817]
∅:D[9.4457] → [10.14391:14413]
B:BD[10.14391] → [10.14391:14413]
```
        return false;
```
[9.4457]
[10.14413]
```
        return (false);
```
Replacement in crawl-ref/source/view.cc at line 2705 [11.16817]
∅:D[12.35] → [10.15239:15264]
∅:D[13.37] → [10.15239:15264]
∅:D[14.4649] → [10.15239:15264]
B:BD[10.15239] → [10.15239:15264]
```
            return true;
```
[14.4649]
[10.15264]
```
            return (true);
```
Replacement in crawl-ref/source/view.cc at line 2707 [11.16817]
B:BD[10.15281] → [10.15281:15307]
```
            return false;
```
[10.15281]
[10.15307]
```
            return (false);
```
Replacement in crawl-ref/source/view.cc at line 2730 [11.16817]
B:BD[10.15862] → [10.15862:15887]
```
            return true;
```
[10.15862]
[10.15887]
```
            return (true);
```
Replacement in crawl-ref/source/view.cc at line 2732 [11.16817]
B:BD[10.15904] → [10.15904:15930]
```
            return false;
```
[10.15904]
[10.15930]
```
            return (false);
```
Replacement in crawl-ref/source/view.cc at line 2755 [11.16817]
∅:D[15.43] → [10.16600:16625]
∅:D[16.43] → [10.16600:16625]
∅:D[17.44] → [10.16600:16625]
B:BD[10.16600] → [10.16600:16625]
```
            return true;
```
[15.43]
[10.16625]
```
            return (true);
```
Replacement in crawl-ref/source/view.cc at line 2757 [11.16817]
B:BD[10.16642] → [10.16642:16668]
```
            return false;
```
[10.16642]
[10.16668]
```
            return (false);
```
Replacement in crawl-ref/source/view.cc at line 2779 [11.16817]
∅:D[16.76] → [10.17274:17299]
∅:D[17.78] → [10.17274:17299]
B:BD[10.17274] → [10.17274:17299]
```
            return true;
```
[16.76]
[10.17299]
```
            return (true);
```
Replacement in crawl-ref/source/view.cc at line 2781 [11.16817]
B:BD[10.17316] → [10.17316:17342]
```
            return false;
```
[10.17316]
[10.17342]
```
            return (false);
```
Replacement in crawl-ref/source/view.cc at line 2789 [11.16817]
∅:D[18.39] → [10.17485:17510]
B:BD[10.17485] → [10.17485:17510]
```
            return true;
```
[18.39]
[10.17510]
```
            return (true);
```
Replacement in crawl-ref/source/view.cc at line 2791 [11.16817]
B:BD[10.17527] → [10.17527:17553]
```
            return false;
```
[10.17527]
[10.17553]
```
            return (false);
```

Replacement in crawl-ref/source/view.cc at line 3164 [11.16817]

B:BD[19.2814] → [19.2814:2908]

        if (getty == CK_MOUSE_B4) getty = '-';
        if (getty == CK_MOUSE_B5) getty = '+';

[19.2814]

[19.2908]

        if (getty == CK_MOUSE_B4)
            getty = '-';
        else if (getty == CK_MOUSE_B5)
            getty = '+';

Replacement in crawl-ref/source/view.cc at line 3618 [11.16817]
B:BD[19.3242] → [19.3242:3285]
```
    GmapInit(true); // re-draw tile backup
```
[19.3242]
[19.3285]
```
    GmapInit(true); // Re-draw tile backup.
```

Replacement in crawl-ref/source/view.cc at line 5308 [11.16817]

B:BD[20.7130] → [3.8:56]

∅:D[3.56] → [21.507:566]

B:BD[21.507] → [21.507:566]

    if (   Options.mlist_allow_alternate_layout
       && !Options.classic_hud
       &&  lay_mlist.valid)

[20.7130]

[21.566]

    if (Options.mlist_allow_alternate_layout
        && !Options.classic_hud
        && lay_mlist.valid)

Replacement in crawl-ref/source/view.cc at line 5315 [11.16817]

B:BD[22.1628] → [20.7216:7350]

B:BD[20.7350] → [23.801:828]

∅:D[23.828] → [20.7397:7426]

B:BD[20.7397] → [20.7397:7426]

    msgp  = winner->msgp;
    msgsz = winner->msgsz;
    viewp = winner->viewp;
    viewsz = winner->viewsz;
    hudp = winner->hudp;
    hudsz = winner->hudsz;
    mlistp = winner->mlistp;

[22.1628]

[20.7426]

    msgp    = winner->msgp;
    msgsz   = winner->msgsz;
    viewp   = winner->viewp;
    viewsz  = winner->viewsz;
    hudp    = winner->hudp;
    hudsz   = winner->hudsz;
    mlistp  = winner->mlistp;

Replacement in crawl-ref/source/view.cc at line 5325 [11.16817]

B:BD[19.6684] → [19.6684:6743]

    // libgui may redefine these based on its own settings

[19.6684]

[4.8]

    // libgui may redefine these based on its own settings.

Replacement in crawl-ref/source/traps.cc at line 475 [25.5308]
B:BD[24.279] → [24.279:321]
```
    for ( int i = 0; i < MAX_TRAPS; ++i )
```
[24.279]
[24.321]
```
    for (int i = 0; i < MAX_TRAPS; ++i)
```

Replacement in crawl-ref/source/traps.cc at line 477 [25.5308]

B:BD[24.327] → [24.327:443]

        if ( env.trap[i].x == pos.x && env.trap[i].y == pos.y &&
             env.trap[i].type != TRAP_UNASSIGNED )

[24.327]

[24.443]

        if (env.trap[i].x == pos.x && env.trap[i].y == pos.y
            && env.trap[i].type != TRAP_UNASSIGNED)

Replacement in crawl-ref/source/traps.cc at line 957 [25.5308]
B:BD[26.1009] → [27.485:532]
```
    // disallow shafts on the first two levels
```
[26.1009]
[27.532]
```
    // Disallow shafts on the first two levels.
```

Replacement in crawl-ref/source/traps.cc at line 1150 [25.5308]

B:BD[26.3789] → [26.3789:3962]

    if ((random2(1 + level_number) > 14 && one_chance_in(3))
        || (place.branch == BRANCH_HALL_OF_ZOT &&
            place.level_type == LEVEL_DUNGEON && coinflip()))

[26.3789]

[26.3962]

    if (random2(1 + level_number) > 14 && one_chance_in(3)
        || (place.branch == BRANCH_HALL_OF_ZOT
            && place.level_type == LEVEL_DUNGEON && coinflip()))

Replacement in crawl-ref/source/traps.cc at line 1171 [25.5308]
B:BD[26.4326] → [26.4326:4359]
```
        switch(place.level_type)
```
[26.4326]
[26.4359]
```
        switch (place.level_type)
```
Replacement in crawl-ref/source/traps.cc at line 1187 [25.5308]
B:BD[26.4723] → [26.4723:4752]
```
    switch(place.level_type)
```
[26.4723]
[26.4752]
```
    switch (place.level_type)
```

Replacement in crawl-ref/source/tile2.cc at line 2856 [19.13289]

B:BD[19.94009] → [19.94009:94084]

    TileRegionClass *r = (flag == REGION_INV1) ? region_item:region_item2;

[19.94009]

[19.94084]

    TileRegionClass *r = (flag == REGION_INV1 ? region_item
                                              : region_item2);

Replacement in crawl-ref/source/tile2.cc at line 2873 [19.13289]

B:BD[19.94312] → [19.94312:94356]

B:BD[19.94356] → [28.582:624]

        int tile0 = (i>=n) ? -1 : tiles[i];
        int idx0  = (i>=n) ? -1 : idx[i];

[19.94312]

[29.19770]

        int tile0 = (i >= n) ? -1 : tiles[i];
        int idx0  = (i >= n) ? -1 : idx[i];

Replacement in crawl-ref/source/tile2.cc at line 2878 [19.13289]

B:BD[19.94477] → [19.94477:94592]

B:BD[19.94592] → [28.705:747]

∅:D[28.747] → [19.94633:94792]

B:BD[19.94633] → [19.94633:94792]

        if ( flag == itemlist_flag
             && tile0  == itemlist[i]
             && num[i] == itemlist_num[i]
             && key    == itemlist_key[i]
             && idx0   == itemlist_idx[i]
             && iflags[i] == itemlist_iflag[i]
             && !force_redraw_inv
             && i < old_itemlist_n)

[19.94477]

[19.94792]

        if (flag == itemlist_flag
            && tile0  == itemlist[i]
            && num[i] == itemlist_num[i]
            && key    == itemlist_key[i]
            && idx0   == itemlist_idx[i]
            && iflags[i] == itemlist_iflag[i]
            && !force_redraw_inv
            && i < old_itemlist_n)

Replacement in crawl-ref/source/tile1.cc at line 37 [19.96318]

B:BD[30.162] → [31.3302:3354]

∅:D[31.3354] → [32.1449:1495]

B:BD[30.215] → [32.1449:1495]

    return (you.level_type == LEVEL_PORTAL_VAULT &&
            you.level_type_name == "bazaar");

[30.162]

[30.257]

    return (you.level_type == LEVEL_PORTAL_VAULT
            && you.level_type_name == "bazaar");

Replacement in crawl-ref/source/tile1.cc at line 394 [19.96318]

B:BD[33.9019] → [7.304:361]

        return tileidx_item(item) | TILE_FLAG_ANIM_WEP;

[33.9019]

[33.9054]

        return tileidx_item(item) | TILE_FLAG_ANIM_WEP;

Replacement in crawl-ref/source/religion.cc at line 461 [11.804403]

∅:D[8.2730] → [34.2818:2847]

B:BD[34.2818] → [34.2818:2847]

    return (is_good_god(god)

[8.2730]

[8.2731]

    return (god == GOD_SHINING_ONE
            || you.worshipped[GOD_SHINING_ONE] && is_good_god(god)

Replacement in crawl-ref/source/output.cc at line 108 [11.1088282]
B:BD[35.4122] → [35.4122:4170]
```
        const int disp = width * val / max_val;
```
[35.4122]
[35.4170]
```
        const int disp  = width * val / max_val;
```

Replacement in crawl-ref/source/output.cc at line 531 [11.1088282]

B:BD[36.2839] → [36.2839:2903]

        cprintf("-) %s", item->name(DESC_PLAIN, true).c_str());

[36.2839]

[36.2903]

        cprintf("-) %s", item->name(DESC_PLAIN, true)
                         .substr(0, crawl_view.hudsz.x - 15).c_str());

Replacement in crawl-ref/source/output.cc at line 1493 [11.1088282]
B:BD[37.8721] → [37.8721:8756]
```
// FIXME: implement this for tiles
```
[37.8721]
[37.8756]
```
// FIXME: Implement this for Tiles!
```
Replacement in crawl-ref/source/libgui.cc at line 1281 [19.5793336]
∅:D[38.3653] → [19.5823936:5824001]
∅:D[39.3928] → [19.5823936:5824001]
B:BD[19.5823936] → [19.5823936:5824001]
```
    if (oldcx == cx && oldcy == cy && oldmode == mode) return 0;
```
[39.3928]
[19.5824001]
```
    if (oldcx == cx && oldcy == cy && oldmode == mode)
        return 0;
```
Replacement in crawl-ref/source/libgui.cc at line 1285 [19.5793336]
B:BD[19.5824026] → [19.5824026:5824078]
```
    if ( oldmode == REGION_DNGN && mode != oldmode)
```
[19.5824026]
[19.5824078]
```
    if (oldmode == REGION_DNGN && mode != oldmode)
```
Replacement in crawl-ref/source/items.cc at line 1924 [11.2584728]
∅:D[40.1350] → [11.2624755:2624826]
∅:D[41.636806] → [11.2624755:2624826]
B:BD[11.2624755] → [11.2624755:2624826]
```
        mpr( "Too many items on this level, not dropping the item." );
```
[40.1350]
[10.356157]
```
        mpr("Too many items on this level, not dropping the item.");
```
Replacement in crawl-ref/source/items.cc at line 1931 [11.2584728]
∅:D[42.8625] → [43.611:651]
B:BD[41.636812] → [43.611:651]
```
    if ( grid_destroys_items(my_grid) )
```
[42.8625]
[43.651]
```
    if (grid_destroys_items(my_grid))
```

Insertion in crawl-ref/source/item_use.cc at line 1314 [11.2781507]

[42.9035]

[44.3486]

    // How many letters are only needed for formatting, but won't ever
    // be printed.
    int colour_length = 0;

Replacement in crawl-ref/source/item_use.cc at line 1329 [11.2781507]

∅:D[45.10279] → [46.3025:3108]

B:BD[46.3025] → [46.3025:3108]

        const launch_retval projected = is_launched(&you, you.weapon(), item_def);

[45.10279]

[39.4556]

        const launch_retval projected = is_launched(&you, you.weapon(),
                                                    item_def);

Replacement in crawl-ref/source/item_use.cc at line 1342 [11.2781507]

B:BD[44.4168] → [2.2619:2700]

    msg << (no_other_items ? "(i - inventory)" : "(i - inventory. (,) - cycle)")

[44.4168]

[46.3466]

    msg << (no_other_items ? "(i - inventory)"
                           : "(i - inventory. (,) - cycle)")

Insertion in crawl-ref/source/item_use.cc at line 1349 [11.2781507]
[45.10363]
[45.10363]
```
        colour_length = 5;
```

Replacement in crawl-ref/source/item_use.cc at line 1353 [11.2781507]

B:BD[46.3591] → [46.3591:3696]

        const char* color = (selected_from_inventory ? "grey" : "w");
        msg << "<" << color << ">"

[46.3591]

[45.10370]

        const char* colour = (selected_from_inventory ? "lightgrey" : "w");
        msg << "<" << colour << ">"

Replacement in crawl-ref/source/item_use.cc at line 1356 [11.2781507]

∅:D[45.10428] → [46.3752:3789]

B:BD[46.3752] → [46.3752:3789]

            << "</" << color << ">";

[45.10428]

[44.4643]

            << "</" << colour << ">";
        colour_length = (selected_from_inventory ? 11 : 3);

Replacement in crawl-ref/source/item_use.cc at line 1360 [11.2781507]

B:BD[46.3791] → [46.3791:3847]

    formatted_message_history(msg.str(), MSGCH_PROMPT);

[46.3791]

[44.4649]

#ifdef USE_TILE
    if (selected_from_inventory)
        tile_draw_inv(REGION_INV1);
#endif
    formatted_message_history(msg.str()
                              .substr(0, crawl_view.msgsz.x + colour_length),
                              MSGCH_PROMPT);

Replacement in crawl-ref/source/item_use.cc at line 1399 [11.2781507]

B:BD[46.4284] → [46.4284:4353]

          // Do this stuff unconditionally to make the prompt redraw

[46.4284]

[46.4353]

          // Do this stuff unconditionally to make the prompt redraw.

Replacement in crawl-ref/source/item_use.cc at line 1415 [11.2781507]
B:BD[46.4832] → [46.4832:4861]
```
          return CMD_NO_CMD;
```
[46.4832]
[46.4861]
```
          return (CMD_NO_CMD);
```
Replacement in crawl-ref/source/item_use.cc at line 1464 [11.2781507]
B:BD[47.3811] → [45.10924:10977]
```
    if (was_chosen || ! beh.selected_from_inventory)
```
[47.3811]
[48.4242]
```
    if (was_chosen || !beh.selected_from_inventory)
```
Replacement in crawl-ref/source/item_use.cc at line 3995 [11.2781507]
B:BD[11.2856088] → [49.5918:5955]
```
        // no additional enchantment
```
[11.2856003]
[49.5955]
```
        // No additional enchantment.
```

Replacement in crawl-ref/source/enum.h at line 2644 [11.3287960]

B:BD[41.930691] → [41.930691:930826]

B:BD[41.930826] → [5.2723:2828]

    TORMENT_CARDS = -2,         // Symbol of torment
    TORMENT_SPWLD = -3,         // Special wield torment
    TORMENT_SCROLL = -4,
    TORMENT_SPELL = -5,         // SPELL_SYMBOL_OF_TORMENT
    TORMENT_XOM = -6            // Xom effect

[41.930691]

[41.930885]

    TORMENT_CARDS   = -2,         // Symbol of torment
    TORMENT_SPWLD   = -3,         // Special wield torment
    TORMENT_SCROLL  = -4,
    TORMENT_SPELL   = -5,         // SPELL_SYMBOL_OF_TORMENT
    TORMENT_XOM     = -6          // Xom effect

Replacement in crawl-ref/source/dungeon.cc at line 2357 [11.3429798]
B:BD[6.13200] → [6.13200:13228]
∅:D[50.5439] → [51.9502:9520]
∅:D[6.13228] → [51.9502:9520]
B:BD[51.9502] → [51.9502:9520]
```
    // No corridor (found).
    return false;
```
[6.13200]
[51.9520]
```
    // No corridor found.
    return (false);
```
Replacement in crawl-ref/source/dungeon.cc at line 2440 [11.3429798]
B:BD[26.7381] → [26.7381:7481]
```
    }                           // end "for i"
}                               // end place_traps()
```
[26.7381]
[26.7481]
```
    }
}
```

Replacement in crawl-ref/source/dungeon.cc at line 7236 [11.3429798]

B:BD[11.3686618] → [11.3686618:3686783]

            env.trap[tcount].x = spec_x;
            env.trap[tcount].y = spec_y;
            grd[spec_x][spec_y] = DNGN_UNDISCOVERED_TRAP;
            return true;

[11.3686618]

[11.3686783]

            env.trap[tcount].x    = spec_x;
            env.trap[tcount].y    = spec_y;
            grd[spec_x][spec_y]   = DNGN_UNDISCOVERED_TRAP;
            return (true);

Replacement in crawl-ref/source/dungeon.cc at line 7242 [11.3429798]
B:BD[11.3686864] → [11.3686864:3686882]
```
    return false;
```
[11.3686864]
[50.13365]
```
    return (false);
```

Fix 1948131: Quiver slot name wraps around the screen.

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/view.cc at line 2673 [11.16817]

Replacement in crawl-ref/source/view.cc at line 2705 [11.16817]

Replacement in crawl-ref/source/view.cc at line 2707 [11.16817]

Replacement in crawl-ref/source/view.cc at line 2730 [11.16817]

Replacement in crawl-ref/source/view.cc at line 2732 [11.16817]

Replacement in crawl-ref/source/view.cc at line 2755 [11.16817]

Replacement in crawl-ref/source/view.cc at line 2757 [11.16817]

Replacement in crawl-ref/source/view.cc at line 2779 [11.16817]

Replacement in crawl-ref/source/view.cc at line 2781 [11.16817]

Replacement in crawl-ref/source/view.cc at line 2789 [11.16817]

Replacement in crawl-ref/source/view.cc at line 2791 [11.16817]

Replacement in crawl-ref/source/view.cc at line 3164 [11.16817]

Replacement in crawl-ref/source/view.cc at line 3618 [11.16817]

Replacement in crawl-ref/source/view.cc at line 5308 [11.16817]

Replacement in crawl-ref/source/view.cc at line 5315 [11.16817]

Replacement in crawl-ref/source/view.cc at line 5325 [11.16817]

Replacement in crawl-ref/source/traps.cc at line 475 [25.5308]

Replacement in crawl-ref/source/traps.cc at line 477 [25.5308]

Replacement in crawl-ref/source/traps.cc at line 957 [25.5308]

Replacement in crawl-ref/source/traps.cc at line 1150 [25.5308]

Replacement in crawl-ref/source/traps.cc at line 1171 [25.5308]

Replacement in crawl-ref/source/traps.cc at line 1187 [25.5308]

Replacement in crawl-ref/source/tile2.cc at line 2856 [19.13289]

Replacement in crawl-ref/source/tile2.cc at line 2873 [19.13289]

Replacement in crawl-ref/source/tile2.cc at line 2878 [19.13289]

Replacement in crawl-ref/source/tile1.cc at line 37 [19.96318]

Replacement in crawl-ref/source/tile1.cc at line 394 [19.96318]

Replacement in crawl-ref/source/religion.cc at line 461 [11.804403]

Replacement in crawl-ref/source/output.cc at line 108 [11.1088282]

Replacement in crawl-ref/source/output.cc at line 531 [11.1088282]

Replacement in crawl-ref/source/output.cc at line 1493 [11.1088282]

Replacement in crawl-ref/source/libgui.cc at line 1281 [19.5793336]

Replacement in crawl-ref/source/libgui.cc at line 1285 [19.5793336]

Replacement in crawl-ref/source/items.cc at line 1924 [11.2584728]

Replacement in crawl-ref/source/items.cc at line 1931 [11.2584728]

Insertion in crawl-ref/source/item_use.cc at line 1314 [11.2781507]

Replacement in crawl-ref/source/item_use.cc at line 1329 [11.2781507]

Replacement in crawl-ref/source/item_use.cc at line 1342 [11.2781507]

Insertion in crawl-ref/source/item_use.cc at line 1349 [11.2781507]

Replacement in crawl-ref/source/item_use.cc at line 1353 [11.2781507]

Replacement in crawl-ref/source/item_use.cc at line 1356 [11.2781507]

Replacement in crawl-ref/source/item_use.cc at line 1360 [11.2781507]

Replacement in crawl-ref/source/item_use.cc at line 1399 [11.2781507]

Replacement in crawl-ref/source/item_use.cc at line 1415 [11.2781507]

Replacement in crawl-ref/source/item_use.cc at line 1464 [11.2781507]

Replacement in crawl-ref/source/item_use.cc at line 3995 [11.2781507]

Replacement in crawl-ref/source/enum.h at line 2644 [11.3287960]

Replacement in crawl-ref/source/dungeon.cc at line 2357 [11.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 2440 [11.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 7236 [11.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 7242 [11.3429798]