fiddlerwoaroof/crawl - Change GB6I56TVUTBXQPQO22VRKEDGYQQNOVRCT5XI656ZKMCX2E2GQHHQC

Making tutorial and named monster tags consistent. Also, making tooltips not disappear until the mouse moves to another square, to address [2564067].

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

Created by ennewalker on February 14, 2009

GB6I56TVUTBXQPQO22VRKEDGYQQNOVRCT5XI656ZKMCX2E2GQHHQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/tutorial.cc at line 1223 [4.5936]

B:BD[3.4919] → [3.4919:4983]

    tiles.add_text_tag(TAG_TUTORIAL, mon.name(DESC_CAP_A), gc);

[3.4919]

[5.545]

    tiles.add_text_tag(TAG_TUTORIAL, &mon);

Insertion in crawl-ref/source/tilesdl.h at line 119 [3.15441]
[3.18022]
[3.18022]
```
    void add_text_tag(text_tag_type type, const monsters* mon);
```

Insertion in crawl-ref/source/tilesdl.cc at line 699 [3.19415]

[3.31664]


// Convenience struct for holding mouse location on screen.
struct cursor_loc
{
    cursor_loc() { reset(); }
    void reset() { reg = NULL; cx = cy = -1; }
    bool operator==(const cursor_loc &rhs) const
    {
        return (rhs.reg == reg 
                && rhs.cx == cx
                && rhs.cy == cy
                && reg);
    }
    Region *reg;
    int cx, cy;
};

Insertion in crawl-ref/source/tilesdl.cc at line 721 [3.19415]
[3.31719]
[3.31719]
```
    cursor_loc cur_loc;
    cursor_loc tip_loc;
```

Insertion in crawl-ref/source/tilesdl.cc at line 801 [3.19415]

[3.33057]


                    // find mouse location
                    for (unsigned int i = 0;
                        i < m_layers[m_active_layer].m_regions.size(); i++)
                    {
                        Region *reg = m_layers[m_active_layer].m_regions[i];
                        if (reg->mouse_pos(m_mouse.x, m_mouse.y, 
                                           cur_loc.cx, cur_loc.cy))
                        {
                            cur_loc.reg = reg;
                            break;
                        }
                    }

Replacement in crawl-ref/source/tilesdl.cc at line 853 [3.19415]

B:BD[3.34239] → [6.922:978]

∅:D[6.978] → [7.208:344]

B:BD[7.208] → [7.208:344]

        bool show_tooltip = ((ticks - m_last_tick_moved
                                > (unsigned int)Options.tile_tooltip_ms)
                                && ticks > m_last_tick_moved);

[3.34239]

[3.34462]

        bool timeout = ((ticks - m_last_tick_moved
                         > (unsigned int)Options.tile_tooltip_ms)
                         && ticks > m_last_tick_moved);
        if (timeout)
            tip_loc = cur_loc;

Replacement in crawl-ref/source/tilesdl.cc at line 859 [3.19415]
B:BD[3.34463] → [3.34463:34489]
```
        if (show_tooltip)
```
[3.34463]
[3.34489]
```
        if (tip_loc == cur_loc)
```
Insertion in crawl-ref/source/tilesdl.cc at line 878 [3.19415]
[3.35031]
[3.35031]
```
            tip_loc.reset();
```

Insertion in crawl-ref/source/tilesdl.cc at line 1513 [3.19415]

[3.44614]

}
void TilesFramework::add_text_tag(text_tag_type type, const monsters* mon)
{
    // HACK.  Names cover up pan demons in a weird way.
    if (mon->type == MONS_PANDEMONIUM_DEMON)
        return;
    const coord_def &gc = mon->pos();
    if (mon->type == MONS_PLAYER_GHOST)
    {
        // Beautification hack.  "Foo's ghost" is a little bit
        // verbose as a tag.  "Foo" on its own should be sufficient.
        tiles.add_text_tag(TAG_NAMED_MONSTER, mon->mname, gc);
    }
    else
    {
        tiles.add_text_tag(TAG_NAMED_MONSTER, mon->name(DESC_PLAIN), gc);
    }

Replacement in crawl-ref/source/tilepick.cc at line 4429 [8.96318]

B:BD[2.2681] → [2.2681:2942]

∅:D[2.2942] → [3.130216:130226]

∅:D[9.18251] → [3.130216:130226]

B:BD[3.130216] → [3.130216:130226]

B:BD[3.130226] → [2.2943:3054]

        if (mon->type == MONS_PLAYER_GHOST)
        {
            // Beautification hack.  "Foo's ghost" is a little bit
            // verbose as a tag.  "Foo" on its own should be sufficient.
            tiles.add_text_tag(TAG_NAMED_MONSTER, mon->mname, gc);
        }
        else
        {
            tiles.add_text_tag(TAG_NAMED_MONSTER, mon->name(DESC_PLAIN), gc);
        }

[2.2681]

[8.216397]

        tiles.add_text_tag(TAG_NAMED_MONSTER, mon);