fiddlerwoaroof/crawl - Change TOOHYAX73C5KPSWGHPCBWCUN62WMMO3BI5CWEEMGV3WBFZ5RIH5AC

Fix non-tile compile of tutorial.cc (whoops!)

Add messages when entering or leaving the level map ('X') in tiles. First attempts at outlining icons via cursor in tile tutorial. (Currently this only works for monsters, though I'm not sure why…)

And some code clean-up for tiles and the tutorial.

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

Created by j-p-e-g on January 19, 2008

TOOHYAX73C5KPSWGHPCBWCUN62WMMO3BI5CWEEMGV3WBFZ5RIH5AC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/tutorial.cc at line 866 [7.5936]

[5.27893]

[6.541]

static bool mons_is_highlighted(const monsters *mons)
{
    return (mons_friendly(mons)
                && Options.friend_brand != CHATTR_NORMAL
            || mons_looks_stabbable(mons)
                && Options.stab_brand != CHATTR_NORMAL
            || mons_looks_distracted(mons)
                && Options.may_stab_brand != CHATTR_NORMAL);
}

Replacement in crawl-ref/source/tutorial.cc at line 884 [7.5936]
B:BD[6.711] → [6.711:760]
```
    if (get_mons_colour(&mon) != (&mon)->colour)
```
[6.711]
[6.760]
```
    if (mons_is_highlighted(&mon))
```

Insertion in crawl-ref/source/tutorial.cc at line 903 [7.5936]

[4.551]

    const coord_def ep = grid2view(coord_def(mon.x, mon.y));
    tile_place_cursor(ep.x-1,ep.y-1,true);

Insertion in crawl-ref/source/tutorial.cc at line 953 [7.5936]

[4.996]

[8.2186]

    unsigned ch;
    unsigned short col;
    get_item_glyph(&item, &ch, &col);

Insertion in crawl-ref/source/tutorial.cc at line 960 [7.5936]

[4.1022]

#else
    // highlight item
    const coord_def ep = grid2view(coord_def(item.x, item.y));
    tile_place_cursor(ep.x-1,ep.y-1,true);

Insertion in crawl-ref/source/tutorial.cc at line 995 [7.5936]
[9.7511]
[4.1465]
Insertion in crawl-ref/source/tutorial.cc at line 1002 [7.5936]
[8.2720]
[4.1559]
```
#else
    const coord_def ep = grid2view(coord_def(x,y));
```
Insertion in crawl-ref/source/tutorial.cc at line 1005 [7.5936]
[4.1566]
[5.31701]
Insertion in crawl-ref/source/tutorial.cc at line 1207 [7.5936]
[4.4252]
[4.4252]
```
#else
          tile_place_cursor(ep.x-1,ep.y-1,true);
```
Insertion in crawl-ref/source/tutorial.cc at line 1231 [7.5936]
[4.4480]
[4.4480]
```
#else
          tile_place_cursor(ep.x-1,ep.y-1,true);
```

Replacement in crawl-ref/source/tutorial.cc at line 1249 [7.5936]

B:BD[6.1331] → [4.4741:4815]

          text << "depicted by " << colour_to_tag(colour) << "^<magenta>"

[6.1331]

[4.4815]

          text << "depicted by " << colour_to_tag(colour) << "^<magenta>";

Insertion in crawl-ref/source/tutorial.cc at line 1264 [7.5936]
[4.5138]
[4.5138]
```
#else
          tile_place_cursor(ep.x-1,ep.y-1,true);
```

Insertion in crawl-ref/source/tutorial.cc at line 1273 [7.5936]

[5.39042]

[4.5225]

#ifdef USE_TILES
          tile_place_cursor(ep.x-1,ep.y-1,true);
#endif

Insertion in crawl-ref/source/tutorial.cc at line 1288 [7.5936]

[5.39298]

[4.5453]

#ifdef USE_TILES
          tile_place_cursor(ep.x-1,ep.y-1,true);
#endif

Insertion in crawl-ref/source/tutorial.cc at line 1576 [7.5936]

[10.2817]

#ifdef USE_TILE
          tile_place_cursor(ep.x-1,ep.y-1,true);
#endif

Replacement in crawl-ref/source/tutorial.cc at line 2240 [7.5936]

B:BD[6.9301] → [11.876:1111]

    if (mons_friendly(mons) && Options.friend_brand != CHATTR_NORMAL
        || mons_looks_stabbable(mons) && Options.stab_brand != CHATTR_NORMAL
        || mons_looks_distracted(mons) && Options.may_stab_brand != CHATTR_NORMAL)
    {

[6.9301]

[6.9348]

    if (mons_is_highlighted(mons))

Deletion in crawl-ref/source/tutorial.cc at line 2242 [7.5936]
B:BD[6.9369] → [11.1112:1118]
```
    }
```
Insertion in crawl-ref/source/tutorial.cc at line 2286 [7.5936]
[6.10254]
[6.10254]
```
    // monster is highlighted
```

Replacement in crawl-ref/source/tile1.cc at line 32 [12.96318]

B:BD[2.215] → [2.215:257]

        you.level_type_name == "bazaar");

[2.215]

[2.257]

            you.level_type_name == "bazaar");

Replacement in crawl-ref/source/tile1.cc at line 56 [12.96318]

B:BD[12.97649] → [12.97649:97781]

        && !is_terrain_seen(gc.x,gc.y)
        || is_envmap_detected_item(gc.x,gc.y)
        || is_envmap_detected_mons(gc.x,gc.y))

[12.97649]

[12.97781]

                && !is_terrain_seen(gc.x,gc.y)
             || is_envmap_detected_item(gc.x,gc.y)
             || is_envmap_detected_mons(gc.x,gc.y))

Replacement in crawl-ref/source/libgui.h at line 130 [12.5789586]
B:BD[12.5792473] → [12.5792473:5792523]
```
               bool mono = false, int where = 0);
```
[12.5792473]
[12.5792523]
```
             bool mono = false, int where = 0);
```
Replacement in crawl-ref/source/libgui.h at line 159 [12.5789586]
B:BD[12.5793185] → [12.5793185:5793205]
```
#define _NOCURSOR 0
```
[12.5793185]
[12.5793205]
```
#define _NOCURSOR     0
```
Insertion in crawl-ref/source/libgui.cc at line 326 [12.5793336]
[3.4197]
[3.4197]
```
    {
```
Insertion in crawl-ref/source/libgui.cc at line 328 [12.5793336]
[3.4272]
[3.4272]
```
    }
```
Replacement in crawl-ref/source/libgui.cc at line 428 [12.5793336]
B:BD[12.5806002] → [12.5806002:5806053]
```
        for (x = gmap_min_x; x <= gmap_max_x; x++)
```
[12.5806002]
[12.5806053]
```
        for (x = gmap_min_x; x <= gmap_max_x; x++, count++)
```
Deletion in crawl-ref/source/libgui.cc at line 432 [12.5793336]
B:BD[12.5806157] → [12.5806157:5806181]
```
            count += 1;
```

Insertion in crawl-ref/source/acr.cc at line 2107 [14.4397395]

[13.2798]

#ifdef USE_TILE
            std::string str = "Move the cursor to view the level map, or "
                              "type <w>?</w> for a list of commands.";
            print_formatted_paragraph(str, get_number_of_cols());
#endif

Insertion in crawl-ref/source/acr.cc at line 2115 [14.4397395]

[13.2860]

            
#ifdef USE_TILE
            mpr("Returning to the game...");
#endif

Fix non-tile compile of tutorial.cc (whoops!)

Dependencies

In channels

Change contents

Insertion in crawl-ref/source/tutorial.cc at line 866 [7.5936]

Replacement in crawl-ref/source/tutorial.cc at line 884 [7.5936]

Insertion in crawl-ref/source/tutorial.cc at line 903 [7.5936]

Insertion in crawl-ref/source/tutorial.cc at line 953 [7.5936]

Insertion in crawl-ref/source/tutorial.cc at line 960 [7.5936]

Insertion in crawl-ref/source/tutorial.cc at line 995 [7.5936]

Insertion in crawl-ref/source/tutorial.cc at line 1002 [7.5936]

Insertion in crawl-ref/source/tutorial.cc at line 1005 [7.5936]

Insertion in crawl-ref/source/tutorial.cc at line 1207 [7.5936]

Insertion in crawl-ref/source/tutorial.cc at line 1231 [7.5936]

Replacement in crawl-ref/source/tutorial.cc at line 1249 [7.5936]

Insertion in crawl-ref/source/tutorial.cc at line 1264 [7.5936]

Insertion in crawl-ref/source/tutorial.cc at line 1273 [7.5936]

Insertion in crawl-ref/source/tutorial.cc at line 1288 [7.5936]

Insertion in crawl-ref/source/tutorial.cc at line 1576 [7.5936]

Replacement in crawl-ref/source/tutorial.cc at line 2240 [7.5936]

Deletion in crawl-ref/source/tutorial.cc at line 2242 [7.5936]

Insertion in crawl-ref/source/tutorial.cc at line 2286 [7.5936]

Replacement in crawl-ref/source/tile1.cc at line 32 [12.96318]

Replacement in crawl-ref/source/tile1.cc at line 56 [12.96318]

Replacement in crawl-ref/source/libgui.h at line 130 [12.5789586]

Replacement in crawl-ref/source/libgui.h at line 159 [12.5789586]

Insertion in crawl-ref/source/libgui.cc at line 326 [12.5793336]

Insertion in crawl-ref/source/libgui.cc at line 328 [12.5793336]

Replacement in crawl-ref/source/libgui.cc at line 428 [12.5793336]

Deletion in crawl-ref/source/libgui.cc at line 432 [12.5793336]

Insertion in crawl-ref/source/acr.cc at line 2107 [14.4397395]

Insertion in crawl-ref/source/acr.cc at line 2115 [14.4397395]