fiddlerwoaroof/crawl - Change GKHIWBXGW3NPOGCY6JUE5S7O5RB34R25Y6NQRNABYE2HZ2JJGKLAC

Fixing assertions from tileidx_unseen due to separation of tiles into different textures.

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

Created by ennewalker on September 6, 2008

GKHIWBXGW3NPOGCY6JUE5S7O5RB34R25Y6NQRNABYE2HZ2JJGKLAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/view.cc at line 4905 [5.16817]

B:BD[3.3601] → [4.1050:1162]

                    tileb[bufcount]     = 0;
                    tileb[bufcount + 1] = tileidx_unseen(' ', gc);

[3.3601]

[3.3707]

                    tileidx_unseen(tileb[bufcount], tileb[bufcount+1], ' ', gc);

Replacement in crawl-ref/source/view.cc at line 4921 [5.16817]

B:BD[3.3732] → [3.3732:3868]

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

[3.3732]

[3.3868]

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

Replacement in crawl-ref/source/view.cc at line 4925 [5.16817]

B:BD[3.3934] → [3.3934:4068]

                        bg = tileidx_unseen(get_envmap_char(gc.x,gc.y), gc);
                        env.tile_bk_bg[gc.x][gc.y] = bg;

[3.3934]

[3.4068]

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

Replacement in crawl-ref/source/view.cc at line 5073 [5.16817]

B:BD[3.6253] → [3.6253:6412]

B:BD[3.6412] → [6.10127:10203]

                                tileb[bufcount] = 0;
                                tileb[bufcount + 1] =
                                    tileidx_unseen(
                                        get_envmap_char( gc.x, gc.y ), gc);

[3.6253]

[3.6484]

                                tileidx_unseen(tileb[bufcount],
                                               tileb[bufcount+1],
                                               get_envmap_char(gc.x, gc.y),
                                               gc);

Replacement in crawl-ref/source/tiles.h at line 47 [3.7013]

B:BD[3.7285] → [3.7285:7334]

int tileidx_unseen(int ch, const coord_def& gc);

[3.7285]

[3.7334]

void tileidx_unseen(unsigned int &fg, unsigned int &bg, int ch,
                    const coord_def& gc);

Replacement in crawl-ref/source/tilepick.cc at line 2256 [3.96318]

B:BD[3.155355] → [3.155355:155403]

int tileidx_unseen(int ch, const coord_def& gc)

[3.155355]

[3.155403]

void tileidx_unseen(unsigned int &fg, unsigned int &bg, int ch,
                    const coord_def& gc)

Deletion in crawl-ref/source/tilepick.cc at line 2259 [3.96318]
B:BD[3.155405] → [3.155405:155431]
```
    int res = TILE_ERROR;
```

Insertion in crawl-ref/source/tilepick.cc at line 2263 [3.96318]

[3.155470]

[7.28432]

    unsigned int flag = tile_unseen_flag(gc);
    bg = TILE_FLOOR_NORMAL | flag;

Replacement in crawl-ref/source/tilepick.cc at line 2269 [3.96318]
∅:D[8.425] → [3.155581:155640]
B:BD[3.155581] → [3.155581:155640]
```
        return TILE_UNSEEN_MONSTER | tile_unseen_flag(gc);
```
[8.425]
[8.426]
```
        fg = TILE_UNSEEN_MONSTER;
        return;
```
Replacement in crawl-ref/source/tilepick.cc at line 2276 [3.96318]
B:BD[3.155729] → [3.155729:155778]
```
        case ' ': res = TILE_DNGN_UNSEEN; break;
```
[3.155729]
[3.155778]
```
        case ' ': bg = TILE_DNGN_UNSEEN; break;
```
Replacement in crawl-ref/source/tilepick.cc at line 2279 [3.96318]
B:BD[3.155820] → [9.125125:125174]
```
        case 177: res = TILE_WALL_NORMAL; break;
```
[3.155820]
[3.155876]
```
        case 177: bg = TILE_WALL_NORMAL; break;
```
Replacement in crawl-ref/source/tilepick.cc at line 2285 [3.96318]
B:BD[3.155942] → [9.125175:125225]
```
        case 250: res = TILE_FLOOR_NORMAL; break;
```
[3.155942]
[3.155990]
```
        case 250: bg = TILE_FLOOR_NORMAL; break;
```

Replacement in crawl-ref/source/tilepick.cc at line 2287 [3.96318]

B:BD[3.156000] → [3.156000:156218]

        case 137: res = TILE_DNGN_WAX_WALL; break;
        case 138: res = TILE_DNGN_STONE_WALL; break;
        case 139: res = TILE_DNGN_METAL_WALL; break;
        case 140: res = TILE_DNGN_GREEN_CRYSTAL_WALL; break;

[3.155991]

[3.156218]

        case 137: bg = TILE_DNGN_WAX_WALL; break;
        case 138: bg = TILE_DNGN_STONE_WALL; break;
        case 139: bg = TILE_DNGN_METAL_WALL; break;
        case 140: bg = TILE_DNGN_GREEN_CRYSTAL_WALL; break;

Replacement in crawl-ref/source/tilepick.cc at line 2293 [3.96318]

B:BD[3.156237] → [3.156237:156553]

        case '!': res = TILE_POTION_OFFSET + 13; break;
        case '"': res = TILE_AMU_NORMAL_OFFSET + 2; break;
        case '#': res = TILE_CLOUD_GREY_SMOKE; break;
        case '$': res = TILE_GOLD; break;
        case '%': res = TILE_FOOD_MEAT_RATION; break;
        case 142: res = TILE_UNSEEN_CORPSE; break;

[3.156237]

[3.156553]

        case '!': fg = TILE_POTION_OFFSET + 13; break;
        case '"': fg = TILE_AMU_NORMAL_OFFSET + 2; break;
        case '#': fg = TILE_CLOUD_GREY_SMOKE; break;
        case '$': fg = TILE_GOLD; break;
        case '%': fg = TILE_FOOD_MEAT_RATION; break;
        case 142: fg = TILE_UNSEEN_CORPSE; break;

Replacement in crawl-ref/source/tilepick.cc at line 2301 [3.96318]
B:BD[3.156573] → [3.156573:156625]
```
        case 134: res = TILE_DNGN_OPEN_DOOR; break;
```
[3.156573]
[3.156625]
```
        case 134: bg = TILE_DNGN_OPEN_DOOR; break;
```

Replacement in crawl-ref/source/tilepick.cc at line 2303 [3.96318]

B:BD[3.156643] → [3.156643:156694]

B:BD[3.156694] → [9.125226:125276]

∅:D[9.125276] → [3.156751:156812]

B:BD[3.156751] → [3.156751:156812]

        case ')': res = TILE_UNSEEN_WEAPON; break;
        case '*': res = TILE_WALL_NORMAL ; break;
        case '+': res =  TILE_BOOK_PAPER_OFFSET + 15; break;

[3.156643]

[3.156812]

        case ')': fg = TILE_UNSEEN_WEAPON; break;
        case '*': fg = TILE_WALL_NORMAL ; break;
        case '+': fg = TILE_BOOK_PAPER_OFFSET + 15; break;

Replacement in crawl-ref/source/tilepick.cc at line 2307 [3.96318]

B:BD[3.156813] → [3.156813:156862]

B:BD[3.156862] → [2.17314:17366]

∅:D[2.17366] → [3.156918:157140]

B:BD[3.156918] → [3.156918:157140]

        case '/': res = TILE_WAND_OFFSET; break;
        case '8': res = TILEP_SILVER_STATUE; break;
        case '<': res = TILE_DNGN_STONE_STAIRS_UP; break;
        case '=': res = TILE_RING_NORMAL_OFFSET + 1; break;
        case '>': res = TILE_DNGN_STONE_STAIRS_DOWN; break;
        case '?': res = TILE_SCROLL; break;

[3.156813]

[3.157140]

        case '/': fg = TILE_WAND_OFFSET; break;
        case '8': fg = TILEP_SILVER_STATUE; break;
        case '<': bg = TILE_DNGN_STONE_STAIRS_UP; break;
        case '=': fg = TILE_RING_NORMAL_OFFSET + 1; break;
        case '>': bg = TILE_DNGN_STONE_STAIRS_DOWN; break;
        case '?': fg = TILE_UNSEEN_ITEM; break;

Replacement in crawl-ref/source/tilepick.cc at line 2314 [3.96318]

B:BD[3.157158] → [3.157158:157260]

B:BD[3.157260] → [10.1280:1331]

        case ']': res = TILE_UNSEEN_ARMOUR; break;
        case '\\': res = TILE_STAFF_OFFSET; break;
        case '^': res = TILE_DNGN_TRAP_ZOT; break;

[3.157158]

[3.157315]

        case ']': fg = TILE_UNSEEN_ARMOUR; break;
        case '\\': fg = TILE_STAFF_OFFSET; break;
        case '^': bg = TILE_DNGN_TRAP_ZOT; break;

Replacement in crawl-ref/source/tilepick.cc at line 2318 [3.96318]

B:BD[3.157333] → [3.157333:157432]

        case 131: res = TILE_UNSEEN_ALTAR; break;
        case '~': res = TILE_UNSEEN_ITEM; break;

[3.157333]

[3.157432]

        case 131: fg = TILE_UNSEEN_ALTAR; break;
        case '~': fg = TILE_UNSEEN_ITEM; break;

Replacement in crawl-ref/source/tilepick.cc at line 2321 [3.96318]

B:BD[3.157450] → [3.157450:157624]

        case 135: res = TILE_DNGN_DEEP_WATER; break;
        case 133: res = TILE_DNGN_BLUE_FOUNTAIN; break;
        case '}': res = TILE_MISC_CRYSTAL_BALL_OF_SEEING; break;

[3.157450]

[11.3740]

        case 135: bg = TILE_DNGN_DEEP_WATER; break;
        case 133: bg = TILE_DNGN_BLUE_FOUNTAIN; break;
        case '}': fg = TILE_MISC_CRYSTAL_BALL_OF_SEEING; break;

Replacement in crawl-ref/source/tilepick.cc at line 2325 [3.96318]

∅:D[11.3764] → [3.157649:157900]

B:BD[3.157649] → [3.157649:157900]

        case 254: res = TILE_DNGN_CLOSED_DOOR; break;
        case 129: res = TILE_DNGN_RETURN; break;
        case 132: res = TILE_UNSEEN_ENTRANCE; break;
        case 136: res = TILE_DNGN_ENTER; break;
        case 141: res = TILE_DNGN_LAVA; break;

[11.3764]

[3.157900]

        case 254: bg = TILE_DNGN_CLOSED_DOOR; break;
        case 129: bg = TILE_DNGN_RETURN; break;
        case 132: fg = TILE_UNSEEN_ENTRANCE; break;
        case 136: bg = TILE_DNGN_ENTER; break;
        case 141: bg = TILE_DNGN_LAVA; break;
        default: fg = TILE_ERROR; break;

Replacement in crawl-ref/source/tilepick.cc at line 2333 [3.96318]
B:BD[3.157906] → [11.3765:3839]
∅:D[11.3839] → [3.157978:158017]
B:BD[3.157978] → [3.157978:158017]
```
    //if (res == TILE_ERROR) printf("undefined mapchar %d [%c]\n",ch,ch);
    return res | tile_unseen_flag(gc);
```
[3.157906]
[3.158017]
```
    bg |= flag;
```
Replacement in crawl-ref/source/libgui.cc at line 59 [3.5793336]
B:BD[3.5803420] → [10.32097:32147]
```
    int t = tileidx_feature(feature, gc.x, gc.y);
```
[3.5803420]
[3.5803458]
```
    unsigned int t = tileidx_feature(feature, gc.x, gc.y);
```

Replacement in crawl-ref/source/libgui.cc at line 61 [3.5793336]

B:BD[3.5803498] → [3.5803498:5803536]

        t = tileidx_unseen(what, gc);

[3.5803498]

[3.5803536]

    {
        unsigned int fg_dummy;
        tileidx_unseen(fg_dummy, t, what, gc);
    }

Replacement in crawl-ref/source/libgui.cc at line 152 [3.5793336]
∅:D[9.167792] → [12.13311:13336]
B:BD[12.13311] → [12.13311:13336]
```
    if (x + len > r->mx)
```
[9.167792]
[12.13336]
```
    if (x + len > (int)r->mx)
```

Fixing assertions from tileidx_unseen due to separation of tiles into different textures.

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/view.cc at line 4905 [5.16817]

Replacement in crawl-ref/source/view.cc at line 4921 [5.16817]

Replacement in crawl-ref/source/view.cc at line 4925 [5.16817]

Replacement in crawl-ref/source/view.cc at line 5073 [5.16817]

Replacement in crawl-ref/source/tiles.h at line 47 [3.7013]

Replacement in crawl-ref/source/tilepick.cc at line 2256 [3.96318]

Deletion in crawl-ref/source/tilepick.cc at line 2259 [3.96318]

Insertion in crawl-ref/source/tilepick.cc at line 2263 [3.96318]

Replacement in crawl-ref/source/tilepick.cc at line 2269 [3.96318]

Replacement in crawl-ref/source/tilepick.cc at line 2276 [3.96318]

Replacement in crawl-ref/source/tilepick.cc at line 2279 [3.96318]

Replacement in crawl-ref/source/tilepick.cc at line 2285 [3.96318]

Replacement in crawl-ref/source/tilepick.cc at line 2287 [3.96318]

Replacement in crawl-ref/source/tilepick.cc at line 2293 [3.96318]

Replacement in crawl-ref/source/tilepick.cc at line 2301 [3.96318]