fiddlerwoaroof/crawl - Change F2C63N6XPW62MIAKMZVW7XT5IKN2G6DBOKID5J6LXMQLM2ACAXQAC

Various cleanups. (I can't run tiles, but it compiled fine, so I hope I didn't

introduce a subtle bug.)

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

Created by haranp on January 27, 2009

F2C63N6XPW62MIAKMZVW7XT5IKN2G6DBOKID5J6LXMQLM2ACAXQAC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/view.h at line 153 [7.13254]

[5.44]

[6.6]

inline unsigned get_envmap_char(const coord_def& c) {
    return get_envmap_char(c.x, c.y);
}

Insertion in crawl-ref/source/view.cc at line 190 [7.16817]

[8.634]

[9.3958]

}
void set_envmap_glyph(const coord_def& c, int object, int col)
{
    set_envmap_glyph(c.x, c.y, object, col);

Insertion in crawl-ref/source/view.cc at line 5175 [7.16817]

[10.7823]

[11.2720]

#ifdef USE_TILE
                const coord_def sep = ep - coord_def(1,1);
#endif

Replacement in crawl-ref/source/view.cc at line 5203 [7.16817]

B:BD[12.208] → [12.208:265]

                        if (igrd[gc.x][gc.y] != NON_ITEM

[12.208]

[12.265]

                        if (igrd(gc) != NON_ITEM

Replacement in crawl-ref/source/view.cc at line 5225 [7.16817]

B:BD[13.1213] → [13.1213:1286]

                    buffy[bufcount]     = get_envmap_char( gc.x, gc.y );

[13.1213]

[9.69416]

                    buffy[bufcount]     = get_envmap_char(gc);

Replacement in crawl-ref/source/view.cc at line 5235 [7.16817]

B:BD[8.3732] → [14.89:221]

                    unsigned int bg = env.tile_bk_bg[gc.x][gc.y];
                    unsigned int fg = env.tile_bk_fg[gc.x][gc.y];

[8.3732]

[8.3868]

                    unsigned int bg = env.tile_bk_bg(gc);
                    unsigned int fg = env.tile_bk_fg(gc);

Replacement in crawl-ref/source/view.cc at line 5238 [7.16817]

B:BD[8.3934] → [14.222:303]

                        tileidx_unseen(fg, bg, get_envmap_char(gc.x, gc.y), gc);

[8.3912]

[15.474]

                        tileidx_unseen(fg, bg, get_envmap_char(gc), gc);

Replacement in crawl-ref/source/view.cc at line 5250 [7.16817]

B:BD[10.9112] → [16.7707:7768]

                    _get_symbol( gc, object, &ch, &colour );

[10.9112]

[17.450]

                    _get_symbol(gc, object, &ch, &colour);

Replacement in crawl-ref/source/view.cc at line 5254 [7.16817]

B:BD[18.56] → [10.9181:9253]

                        set_envmap_glyph( gc.x, gc.y, object, colour );

[18.56]

[19.1756]

                        set_envmap_glyph(gc, object, colour);

Replacement in crawl-ref/source/view.cc at line 5258 [7.16817]

∅:D[19.1892] → [10.9253:9447]

B:BD[10.9253] → [10.9253:9447]

                        set_terrain_seen( gc.x, gc.y );
                        set_envmap_detected_mons(gc.x, gc.y, false);
                        set_envmap_detected_item(gc.x, gc.y, false);

[19.1892]

[8.4207]

                        set_terrain_seen(gc);
                        set_envmap_detected_mons(gc, false);
                        set_envmap_detected_item(gc, false);

Replacement in crawl-ref/source/view.cc at line 5265 [7.16817]

B:BD[8.4296] → [20.1014:1067]

∅:D[20.1067] → [8.4350:4407]

B:BD[8.4350] → [8.4350:4407]

B:BD[8.4407] → [2.7:117]

                        env.tile_bk_bg[gc.x][gc.y] =
                            env.tile_bg[ep.x-1][ep.y-1];
                        env.tile_bk_fg[gc.x][gc.y] =
                            env.tile_fg[ep.x-1][ep.y-1];

[8.4296]

[18.310]

                        env.tile_bk_bg(gc) = env.tile_bg(sep);
                        env.tile_bk_fg(gc) = env.tile_fg(sep);

Replacement in crawl-ref/source/view.cc at line 5269 [7.16817]

B:BD[17.673] → [8.4408:4476]

                    tileb[bufcount] = env.tile_fg[ep.x-1][ep.y-1] =

[17.673]

[8.4476]

                    tileb[bufcount] = env.tile_fg(sep) =

Replacement in crawl-ref/source/view.cc at line 5271 [7.16817]

B:BD[8.4532] → [8.4532:4601]

                    tileb[bufcount+1] = env.tile_bg[ep.x-1][ep.y-1];

[8.4532]

[8.4601]

                    tileb[bufcount+1] = env.tile_bg(sep);

Replacement in crawl-ref/source/view.cc at line 5297 [7.16817]

B:BD[8.4626] → [21.9752:9890]

                    tileb[bufcount]   = env.tile_fg[ep.x-1][ep.y-1];
                    tileb[bufcount+1] = env.tile_bg[ep.x-1][ep.y-1];

[8.4626]

[8.4760]

                    tileb[bufcount]   = env.tile_fg(sep);
                    tileb[bufcount+1] = env.tile_bg(sep);

Replacement in crawl-ref/source/view.cc at line 5314 [7.16817]

∅:D[19.2037] → [10.9890:9950]

B:BD[10.9890] → [10.9890:9950]

B:BD[10.9950] → [8.4768:4844]

∅:D[8.4844] → [10.9950:10096]

B:BD[10.9950] → [10.9950:10096]

                            set_terrain_seen( gc.x, gc.y );
                            set_envmap_glyph( gc.x, gc.y, object, colour );
                            set_envmap_detected_mons(gc.x, gc.y, false);
                            set_envmap_detected_item(gc.x, gc.y, false);

[19.2037]

[8.4845]

                            set_terrain_seen(gc);
                            set_envmap_glyph(gc, object, colour );
                            set_envmap_detected_mons(gc, false);
                            set_envmap_detected_item(gc, false);

Replacement in crawl-ref/source/view.cc at line 5323 [7.16817]

B:BD[8.5071] → [8.5071:5253]

                                env.tile_bk_fg[gc.x][gc.y] =
                                    get_clean_map_idx(
                                    env.tile_fg[ep.x-1][ep.y-1]);

[8.5071]

[8.5253]

                                env.tile_bk_fg(gc) =
                                    get_clean_map_idx(env.tile_fg(sep));

Replacement in crawl-ref/source/view.cc at line 5328 [7.16817]

B:BD[8.5346] → [8.5346:5407]

B:BD[8.5407] → [22.60:125]

                                env.tile_bk_fg[gc.x][gc.y] =
                                    env.tile_fg[ep.x-1][ep.y-1];

[8.5346]

[8.5535]

                                env.tile_bk_fg(gc) = env.tile_fg(sep);

Replacement in crawl-ref/source/view.cc at line 5330 [7.16817]

B:BD[8.5565] → [8.5565:5683]

                            env.tile_bk_bg[gc.x][gc.y] =
                                env.tile_bg[ep.x-1][ep.y-1];

[8.5565]

[8.5683]

                            env.tile_bk_bg(gc) = env.tile_bg(sep);

Replacement in crawl-ref/source/view.cc at line 5345 [7.16817]

B:BD[9.72401] → [3.41:106]

∅:D[3.106] → [10.10144:10206]

B:BD[10.10144] → [10.10144:10206]

                        if (Options.clean_map && Show_Backup(ep)
                            && is_terrain_seen( gc.x, gc.y ))

[9.72401]

[9.72557]

                        if (Options.clean_map
                            && Show_Backup(ep)
                            && is_terrain_seen(gc))

Replacement in crawl-ref/source/view.cc at line 5349 [7.16817]

B:BD[9.72583] → [16.7831:7909]

∅:D[16.7909] → [10.10332:10463]

∅:D[21.10018] → [10.10332:10463]

B:BD[10.10332] → [10.10332:10463]

                            _get_symbol( gc, Show_Backup(ep), &ch, &colour );
                            set_envmap_glyph( gc.x, gc.y, Show_Backup(ep),
                                              colour );

[9.72583]

[9.72719]

                            _get_symbol(gc, Show_Backup(ep), &ch, &colour);
                            set_envmap_glyph(gc, Show_Backup(ep), colour);

Replacement in crawl-ref/source/view.cc at line 5366 [7.16817]

B:BD[13.1677] → [13.1677:1758]

                            buffy[bufcount]     = get_envmap_char( gc.x, gc.y );

[13.1677]

[9.73618]

                            buffy[bufcount]     = get_envmap_char(gc);

Replacement in crawl-ref/source/view.cc at line 5375 [7.16817]

B:BD[8.5707] → [21.10060:10124]

∅:D[21.10124] → [8.5770:5838]

B:BD[8.5770] → [8.5770:5838]

                            if (env.tile_bk_fg[gc.x][gc.y] != 0
                                || env.tile_bk_bg[gc.x][gc.y] != 0)

[8.5707]

[8.5838]

                            if (env.tile_bk_fg(gc) != 0
                                || env.tile_bk_bg(gc) != 0)

Replacement in crawl-ref/source/view.cc at line 5378 [7.16817]

B:BD[8.5868] → [8.5868:5982]

                                tileb[bufcount] =
                                    env.tile_bk_fg[gc.x][gc.y];

[8.5868]

[21.10125]

                                tileb[bufcount] = env.tile_bk_fg(gc);

Replacement in crawl-ref/source/view.cc at line 5381 [7.16817]

B:BD[8.6036] → [23.1053:1116]

∅:D[23.1116] → [8.6100:6160]

B:BD[8.6100] → [8.6100:6160]

                                    env.tile_bk_bg[gc.x][gc.y]
                                    | tile_unseen_flag(gc);

[8.6036]

[8.6160]

                                    env.tile_bk_bg(gc) | tile_unseen_flag(gc);

Replacement in crawl-ref/source/view.cc at line 5387 [7.16817]

B:BD[14.434] → [14.434:510]

                                               get_envmap_char(gc.x, gc.y),

[14.434]

[14.510]

                                               get_envmap_char(gc),

Replacement in crawl-ref/source/view.cc at line 5399 [7.16817]

B:BD[24.48] → [25.7:137]

                        see_grid(gc.x, gc.y) ? real_colour(flash_colour)
                                             : DARKGREY;

[24.48]

[26.311]

                        see_grid(gc) ? real_colour(flash_colour)
                                     : DARKGREY;

Replacement in crawl-ref/source/view.cc at line 5439 [7.16817]
∅:D[27.889] → [9.75365:75417]
B:BD[7.112785] → [9.75365:75417]
```
}                               // end viewwindow()
```
[27.889]
[28.2621]
```
}
```
Replacement in crawl-ref/source/shopping.cc at line 1804 [7.759950]
B:BD[7.798588] → [29.195624:195657]
```
    int shop_type = cshop->type;
```
[7.798588]
[7.798631]
```
    const shop_type type = cshop->type;
```

Replacement in crawl-ref/source/shopping.cc at line 1812 [7.759950]

B:BD[7.798860] → [7.798860:798938]

    if (shop_type == SHOP_WEAPON_ANTIQUE || shop_type == SHOP_ARMOUR_ANTIQUE)

[7.798860]

[30.510]

    if (type == SHOP_WEAPON_ANTIQUE || type == SHOP_ARMOUR_ANTIQUE)

Replacement in crawl-ref/source/shopping.cc at line 1816 [7.759950]

B:BD[30.557] → [30.557:743]

        (shop_type == SHOP_WEAPON
         || shop_type == SHOP_WEAPON_ANTIQUE) ? "Weapon" :
        (shop_type == SHOP_ARMOUR
         || shop_type == SHOP_ARMOUR_ANTIQUE) ? "Armour" :

[30.557]

[26.3448]

        (type == SHOP_WEAPON
         || type == SHOP_WEAPON_ANTIQUE) ? "Weapon" :
        (type == SHOP_ARMOUR
         || type == SHOP_ARMOUR_ANTIQUE) ? "Armour" :

Replacement in crawl-ref/source/shopping.cc at line 1821 [7.759950]

∅:D[26.3449] → [30.752:1310]

B:BD[30.752] → [30.752:1310]

        (shop_type == SHOP_JEWELLERY)         ? "Jewellery" :
        (shop_type == SHOP_WAND)              ? "Magical Wand" :
        (shop_type == SHOP_BOOK)              ? "Book" :
        (shop_type == SHOP_FOOD)              ? "Food" :
        (shop_type == SHOP_SCROLL)            ? "Magic Scroll" :
        (shop_type == SHOP_GENERAL_ANTIQUE)   ? "Assorted Antiques" :
        (shop_type == SHOP_DISTILLERY)        ? "Distillery" :
        (shop_type == SHOP_GENERAL)           ? "General Store"
                                              : "Bug";

[26.3449]

[7.799879]

        (type == SHOP_JEWELLERY)         ? "Jewellery" :
        (type == SHOP_WAND)              ? "Magical Wand" :
        (type == SHOP_BOOK)              ? "Book" :
        (type == SHOP_FOOD)              ? "Food" :
        (type == SHOP_SCROLL)            ? "Magic Scroll" :
        (type == SHOP_GENERAL_ANTIQUE)   ? "Assorted Antiques" :
        (type == SHOP_DISTILLERY)        ? "Distillery" :
        (type == SHOP_GENERAL)           ? "General Store"
                                         : "Bug";

Replacement in crawl-ref/source/shopping.cc at line 1831 [7.759950]

B:BD[7.799880] → [7.799880:799992]

    if (shop_type != SHOP_GENERAL
        && shop_type != SHOP_GENERAL_ANTIQUE && shop_type != SHOP_DISTILLERY)

[7.799880]

[7.799992]

    if (type != SHOP_GENERAL
        && type != SHOP_GENERAL_ANTIQUE
        && type != SHOP_DISTILLERY)

Replacement in crawl-ref/source/shopping.cc at line 1846 [7.759950]

B:BD[4.368] → [4.368:461]

    return (item.pos.x == 0 && item.pos.y >= 5
            && item.pos.y < (MAX_SHOPS + 5));

[4.368]

[4.461]

    return (item.pos.x == 0 && item.pos.y >= 5 && item.pos.y < (MAX_SHOPS + 5));