fiddlerwoaroof/crawl - Change 44LY6TB272RWWFLON2XOUIXWFPUXM5OMX6KLX66HH37BNURVT4DQC

Updating tiles bazaar logic to reflect DNGN_FLOOR_SPECIAL removal.

Fixing issues when viewing the dungeon via right-clicking on the map.

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

Created by ennewalker on January 15, 2008

44LY6TB272RWWFLON2XOUIXWFPUXM5OMX6KLX66HH37BNURVT4DQC

Dependencies

[2] 25CH7HH4LKXFIZ75YNMXS3TSXO6O27DYSOPLOD45K4OCNFWLS4LQC

In channels

main

Change contents

Insertion in crawl-ref/source/tile1.cc at line 27 [2.96318]

[2.97152]

[2.97281]


bool is_bazaar()
{
    return (you.level_type == LEVEL_PORTAL_VAULT && 
        you.level_type_name == "bazaar");
}
unsigned short get_bazaar_special_colour()
{
    return YELLOW;
}

Replacement in crawl-ref/source/tile1.cc at line 2007 [2.96318]

B:BD[2.158419] → [2.158419:158485]

void finalize_tile(short unsigned int *tile, unsigned char wflag,

[2.158419]

[2.158485]

void finalize_tile(short unsigned int *tile, bool is_special,

Replacement in crawl-ref/source/tile1.cc at line 2022 [2.96318]
B:BD[2.159064] → [2.159064:159108]
```
    if (orig == TILE_DNGN_FLOOR_SPECIAL && 
```
[2.159064]
[2.159108]
```
    if (orig == TILE_DNGN_FLOOR && is_special &&
```

Insertion in crawl-ref/source/tile1.cc at line 3284 [2.96318]

[2.199398]

    const bool bazaar = is_bazaar();
    const unsigned short baz_col = get_bazaar_special_colour();

Replacement in crawl-ref/source/tile1.cc at line 3299 [2.96318]

B:BD[2.199854] → [2.199854:199903]

            if (grd[x][y] == DNGN_FLOOR_SPECIAL)

[2.199854]

[2.199903]

            if (bazaar && env.grid_colours[x][y] == baz_col &&
                grd[x][y] == DNGN_FLOOR)

Insertion in crawl-ref/source/tile1.cc at line 3306 [2.96318]

[2.200212]

                unsigned short left_col = (x > 0) ? 
                    env.grid_colours[x-1][y] : BLACK;
                unsigned short right_col = (x < GXM - 1) ? 
                    env.grid_colours[x+1][y] : BLACK;
                unsigned short up_col = (y > 0) ?
                    env.grid_colours[x][y-1] : BLACK;
                unsigned short down_col = (y < GYM - 1) ?
                    env.grid_colours[x][y+1] : BLACK;

Replacement in crawl-ref/source/tile1.cc at line 3320 [2.96318]

B:BD[2.200556] → [2.200556:201010]

                bool l_nrm = left_grd == DNGN_FLOOR;
                bool r_nrm = right_grd == DNGN_FLOOR;
                bool u_nrm = up_grd == DNGN_FLOOR;
                bool d_nrm = down_grd == DNGN_FLOOR;
                bool l_spc = left_grd == DNGN_FLOOR_SPECIAL;
                bool r_spc = right_grd == DNGN_FLOOR_SPECIAL;
                bool u_spc = up_grd == DNGN_FLOOR_SPECIAL;
                bool d_spc = down_grd == DNGN_FLOOR_SPECIAL;

[2.200556]

[2.201010]

                bool l_nrm = left_grd == DNGN_FLOOR && left_col != baz_col;
                bool r_nrm = right_grd == DNGN_FLOOR && right_col != baz_col;
                bool u_nrm = up_grd == DNGN_FLOOR && up_col != baz_col;
                bool d_nrm = down_grd == DNGN_FLOOR && down_col != baz_col;
                bool l_spc = left_grd == DNGN_FLOOR && left_col == baz_col;
                bool r_spc = right_grd == DNGN_FLOOR && right_col == baz_col;
                bool u_spc = up_grd == DNGN_FLOOR && up_col == baz_col;
                bool d_spc = down_grd == DNGN_FLOOR && down_col == baz_col;

Insertion in crawl-ref/source/tile1.cc at line 3462 [2.96318]
[2.206920]
[2.206920]
```
    if (!bazaar)
        return;
```

Replacement in crawl-ref/source/tile1.cc at line 3487 [2.96318]

B:BD[2.207572] → [2.207572:207621]

            if (grd[x][y] != DNGN_FLOOR_SPECIAL)

[2.207572]

[2.207621]

            if (grd[x][y] != DNGN_FLOOR || env.grid_colours[x][y] != baz_col)

Insertion in crawl-ref/source/tile1.cc at line 3489 [2.96318]
[2.207647]
[2.207647]

Insertion in crawl-ref/source/tile1.cc at line 3787 [2.96318]

[2.217391]

    const bool bazaar = is_bazaar();
    const unsigned short baz_col = get_bazaar_special_colour();

Replacement in crawl-ref/source/tile1.cc at line 3794 [2.96318]

B:BD[2.217499] → [2.217499:217609]

            const int gx = view2gridX(x);
            const int gy = view2gridY(y);
            int wall = 0;

[2.217499]

[2.217609]

            // View coords are not centered on you, but on (cx,cy)
            const int gx = view2gridX(x + 1) + cx - you.x_pos;
            const int gy = view2gridY(y + 1) + cy - you.y_pos;

Insertion in crawl-ref/source/tile1.cc at line 3801 [2.96318]
[2.217707]
[2.217707]
```
            bool is_special = false;
```

Insertion in crawl-ref/source/tile1.cc at line 3807 [2.96318]

[2.217980]

                is_special = 
                    (bazaar && env.grid_colours[gx][gy] == baz_col);

Replacement in crawl-ref/source/tile1.cc at line 3810 [2.96318]

B:BD[2.217994] → [2.217994:218042]

            finalize_tile(&tileb[count], wall,

[2.217994]

[2.218042]


            finalize_tile(&tileb[count], is_special,

Replacement in crawl-ref/source/tile1.cc at line 3813 [2.96318]

B:BD[2.218093] → [2.218093:218142]

            finalize_tile(&tileb[count+1], wall,

[2.218093]

[2.218142]

            finalize_tile(&tileb[count+1], is_special,