fiddlerwoaroof/crawl - Change PEZFWKRHDHV4UJTPK5XJZ3CGTZ3LPTDYSPTYBENLQ7VRSP7YFSIQC

[2021074] Tiles cursor improvements.

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

Created by ennewalker on July 26, 2008

PEZFWKRHDHV4UJTPK5XJZ3CGTZ3LPTDYSPTYBENLQ7VRSP7YFSIQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/view.cc at line 2634 [4.16817]

B:BD[4.69691] → [5.7:117]

B:BD[5.117] → [2.2775:2857]

                dungeon_feature_type dfeat = gr[realx][realy];
                if (dfeat == DNGN_SECRET_DOOR)
                    dfeat = grid_secret_door_appearance(coord_def(realx, realy));

[4.69691]

[6.453]

                coord_def real(realx, realy);
                dungeon_feature_type dfeat = grid_appearance(real);

Replacement in crawl-ref/source/view.cc at line 4581 [4.16817]
B:BD[4.102292] → [7.248:291]
```
    int             object = env.show(ep);
```
[4.102292]
[7.291]
```
    int             object = show_appearance(ep);
```
Deletion in crawl-ref/source/view.cc at line 4588 [4.16817]
B:BD[4.102878] → [8.63959:63995]
B:BD[8.63995] → [2.3768:3831]
∅:D[2.3831] → [4.103107:103108]
∅:D[8.64049] → [4.103107:103108]
B:BD[4.103107] → [4.103107:103108]
```
    if (object == DNGN_SECRET_DOOR)
        object = grid_secret_door_appearance(coord_def(x, y));
```

Replacement in crawl-ref/source/view.cc at line 4647 [4.16817]

B:BD[8.65710] → [9.1106:1144]

                int object = grd(gc);

[8.65710]

[10.7270]

                int object = grid_appearance(gc);

Deletion in crawl-ref/source/view.cc at line 4651 [4.16817]
B:BD[4.104473] → [8.65799:65847]
B:BD[8.65847] → [2.3832:3896]
∅:D[9.1217] → [4.104535:104536]
∅:D[2.3896] → [4.104535:104536]
∅:D[8.65915] → [4.104535:104536]
B:BD[4.104535] → [4.104535:104536]
```
                if (object == DNGN_SECRET_DOOR)
                    object = grid_secret_door_appearance( gc );
```
Replacement in crawl-ref/source/view.cc at line 4739 [4.16817]
B:BD[11.4820] → [11.4820:4851]
```
    int object = env.show(ep);
```
[11.4820]
[11.4851]
```
    int object = show_appearance(ep);
```
Deletion in crawl-ref/source/view.cc at line 4746 [4.16817]
B:BD[11.4965] → [11.4965:5002]
B:BD[11.5002] → [2.3897:3950]
```
    if (object == DNGN_SECRET_DOOR)
        object = grid_secret_door_appearance( pos );
```

Replacement in crawl-ref/source/view.cc at line 4987 [4.16817]

B:BD[8.70297] → [10.9505:9564]

                    int             object = env.show(ep);

[8.70297]

[10.9564]

                    int             object = show_appearance(ep);

Deletion in crawl-ref/source/view.cc at line 4991 [4.16817]
B:BD[4.109201] → [8.70679:70731]
B:BD[8.70731] → [2.4261:4329]
∅:D[2.4329] → [4.109430:109431]
∅:D[10.9744] → [4.109430:109431]
∅:D[8.70803] → [4.109430:109431]
B:BD[4.109430] → [4.109430:109431]
```
                    if (object == DNGN_SECRET_DOOR)
                        object = grid_secret_door_appearance( gc );
```
Insertion in crawl-ref/source/tilesdl.cc at line 515 [12.19415]
[12.31856]
[12.31856]
```
            tiles.clear_text_tags(TAG_CELL_DESC);
```
Insertion in crawl-ref/source/tilesdl.cc at line 591 [12.19415]
[12.34499]
[12.34499]
```
            tiles.clear_text_tags(TAG_CELL_DESC);
```
Insertion in crawl-ref/source/tilereg.h at line 215 [12.45514]
[12.50172]
[12.50172]
```
    TAG_CELL_DESC,
```
Insertion in crawl-ref/source/tilereg.h at line 250 [12.45514]
[12.51522]
[12.51522]
```
    void draw_cursor(cursor_type type, unsigned int tile);
```
Insertion in crawl-ref/source/tilereg.cc at line 28 [12.54399]
[12.54988]
[12.54988]
```
#include "view.h"
```

Insertion in crawl-ref/source/tilereg.cc at line 789 [12.54399]

[12.76474]


void DungeonRegion::draw_cursor(cursor_type type, unsigned int tile)
{
    const coord_def &gc = m_cursor[type];
    if (gc == NO_CURSOR || !on_screen(gc))
        return;

Insertion in crawl-ref/source/tilereg.cc at line 796 [12.54399]
[12.76475]
[12.76475]
```
    add_quad(TEX_DEFAULT, tile, gc.x - m_cx_to_gx, gc.y - m_cy_to_gy);
}
```

Insertion in crawl-ref/source/tilereg.cc at line 904 [12.54399]

[12.79272]

    draw_cursor(CURSOR_TUTORIAL, TILE_TUTORIAL_CURSOR);
    draw_cursor(CURSOR_MOUSE, see_grid(m_cursor[CURSOR_MOUSE]) ? TILE_CURSOR
                                                               : TILE_CURSOR2);
    if (m_cursor[CURSOR_TUTORIAL] != NO_CURSOR
        && on_screen(m_cursor[CURSOR_TUTORIAL]))
    {
        add_quad(TEX_DEFAULT, TILE_TUTORIAL_CURSOR,
                 m_cursor[CURSOR_TUTORIAL].x,
                 m_cursor[CURSOR_TUTORIAL].y);
    }

Insertion in crawl-ref/source/tilereg.cc at line 959 [12.54399]
[12.80489]
[12.80489]
```
    tiles.clear_text_tags(TAG_CELL_DESC);
```

Replacement in crawl-ref/source/tilereg.cc at line 979 [12.54399]

B:BD[12.80941] → [12.80941:81105]

    // TODO enne - can we handle this through tooltips
    // Destroying the message area is such bad behaviour.
    // mesclr();
    // terse_describe_square(gc);

[12.80941]

[12.81105]

    if (event.event == MouseEvent::MOVE)
    {
        const std::string &desc = get_terse_square_desc(gc);
        // Suppress floor description
        if (desc != "floor")
            tiles.add_text_tag(TAG_CELL_DESC, desc, gc);
    }

Deletion in crawl-ref/source/tilereg.cc at line 1103 [12.54399]

B:BD[12.84035] → [12.84035:84513]

    unsigned int unmask = ~((type == CURSOR_MOUSE) ? TILE_FLAG_CURSOR :
                                                     TILE_FLAG_TUT_CURSOR);
    unsigned int mask = (type == CURSOR_MOUSE) ? TILE_FLAG_CURSOR1 :
                                                 TILE_FLAG_TUT_CURSOR;
    // Remove cursor from previous location
    if (on_screen(m_cursor[type]))
    {
        unsigned int idx = get_buffer_index(m_cursor[type]) + 1;
        m_tileb[idx] &= unmask;
    }

Deletion in crawl-ref/source/tilereg.cc at line 1130 [12.54399]

B:BD[12.85447] → [12.85447:85785]

    }
    // Add cursor to new location
    if ((m_cursor[type] != NO_CURSOR) && on_screen(m_cursor[type]))
    {
        unsigned int idx = get_buffer_index(m_cursor[type]) + 1;
        m_tileb[idx] &= unmask;
        // TODO enne - specify type of cursor in place_cursor? or determine type based on grd?
        m_tileb[idx] |= mask;

Replacement in crawl-ref/source/tilepick.cc at line 3988 [13.96318]
B:BD[13.210490] → [13.210490:210529]
```
            int object = env.show(ep);
```
[13.210490]
[13.210529]
```
            int object = show_appearance(ep);
```
Deletion in crawl-ref/source/tilepick.cc at line 3991 [13.96318]
B:BD[13.210589] → [14.401:449]
B:BD[14.449] → [3.301:368]
∅:D[3.368] → [15.402:403]
∅:D[14.524] → [15.402:403]
B:BD[13.210858] → [15.402:403]
```
                if (object == DNGN_SECRET_DOOR)
                    object = (int)grid_secret_door_appearance(gc);
```

Replacement in crawl-ref/source/terrain.h at line 53 [17.24828]

B:BD[16.297] → [2.7383:7459]

∅:D[18.204] → [17.26409:26464]

∅:D[2.7459] → [17.26409:26464]

B:BD[17.26409] → [17.26409:26464]

dungeon_feature_type grid_secret_door_appearance( const coord_def& where );
bool grid_destroys_items( dungeon_feature_type grid );

[16.297]

[17.26464]

dungeon_feature_type grid_secret_door_appearance(const coord_def &where);
dungeon_feature_type grid_appearance(const coord_def &gc);
unsigned int show_appearance(const coord_def &ep);
bool grid_destroys_items(dungeon_feature_type grid);

Insertion in crawl-ref/source/terrain.cc at line 303 [17.26938]

[19.1157]


unsigned int show_appearance(const coord_def &ep)
{
    unsigned int object = env.show(ep);
    const coord_def gc = view2grid(show2view(ep));

Replacement in crawl-ref/source/terrain.cc at line 309 [17.26938]

B:BD[19.1158] → [2.7461:7536]

dungeon_feature_type grid_secret_door_appearance( const coord_def& where )

[19.1158]

[17.32698]

    if (object == DNGN_SECRET_DOOR)
        object = grid_secret_door_appearance(gc);
    return object;
}
dungeon_feature_type grid_appearance(const coord_def &gc)

Insertion in crawl-ref/source/terrain.cc at line 317 [17.26938]

[17.32700]

[18.274]

    dungeon_feature_type grid = grd(gc);
    if (grid == DNGN_SECRET_DOOR)
        grid = grid_secret_door_appearance(gc);
    return grid;
}
dungeon_feature_type grid_secret_door_appearance(const coord_def &where)
{

Insertion in crawl-ref/source/directn.h at line 163 [4.3696722]
[20.5129]
[21.9366]
```
std::string get_terse_square_desc(const coord_def &gc);
```

Insertion in crawl-ref/source/directn.cc at line 1222 [4.3697945]

[22.16544]

[4.3705152]

}
std::string get_terse_square_desc(const coord_def &gc)
{
    std::string desc;
    const char *unseen_desc = "[unseen terrain]";
    bool is_feature = false;
    if (gc == you.pos())
    {
        desc = you.your_name;
    }
    else if (!map_bounds(gc))
    {
        desc = unseen_desc;
    }
    else if (!see_grid(gc))
    {
        if (is_terrain_seen(gc)) 
        {
            desc = feature_description(gc, false, DESC_PLAIN, false);
            if (!see_grid(gc))
            {
                desc = "[" + desc + "]";
            }
            is_feature = true;
        }
        else
        {
            desc = unseen_desc;
        }
    }
    else if (mgrd(gc) != NON_MONSTER)
    {
        const monsters &mons = menv[mgrd(gc)];
        if (mons_is_mimic(mons.type) && !(mons.flags & MF_KNOWN_MIMIC))
        {
            item_def item;
            get_mimic_item(&mons, item);
            desc = item.name(DESC_PLAIN);
        }
        else
        {
            desc = mons.name(DESC_PLAIN);
            if (mons.has_base_name())
            {
                desc += ", ";
                desc += mons.base_name(DESC_NOCAP_THE, false);
            }
        }
    }
    else if (igrd(gc) != NON_ITEM)
    {
        desc = mitm[igrd(gc)].name(DESC_PLAIN);
    }
    else
    {
        desc = feature_description(gc, false, DESC_PLAIN, false);
        is_feature = true;
    }
    return desc;

[2021074] Tiles cursor improvements.

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/view.cc at line 2634 [4.16817]

Replacement in crawl-ref/source/view.cc at line 4581 [4.16817]

Deletion in crawl-ref/source/view.cc at line 4588 [4.16817]

Replacement in crawl-ref/source/view.cc at line 4647 [4.16817]

Deletion in crawl-ref/source/view.cc at line 4651 [4.16817]

Replacement in crawl-ref/source/view.cc at line 4739 [4.16817]

Deletion in crawl-ref/source/view.cc at line 4746 [4.16817]

Replacement in crawl-ref/source/view.cc at line 4987 [4.16817]

Deletion in crawl-ref/source/view.cc at line 4991 [4.16817]

Insertion in crawl-ref/source/tilesdl.cc at line 515 [12.19415]

Insertion in crawl-ref/source/tilesdl.cc at line 591 [12.19415]

Insertion in crawl-ref/source/tilereg.h at line 215 [12.45514]

Insertion in crawl-ref/source/tilereg.h at line 250 [12.45514]

Insertion in crawl-ref/source/tilereg.cc at line 28 [12.54399]

Insertion in crawl-ref/source/tilereg.cc at line 789 [12.54399]

Insertion in crawl-ref/source/tilereg.cc at line 796 [12.54399]

Insertion in crawl-ref/source/tilereg.cc at line 904 [12.54399]

Insertion in crawl-ref/source/tilereg.cc at line 959 [12.54399]