fiddlerwoaroof/crawl - Change 7HA2754QW3SBCAJ5K6KUXNXXXIZB5BIBCFPLXADCXHH6EREKXHSAC

Fix tutorial output for tile mode. For now, we simply suppress

output of ASCII item/monster symbols. Also, fix non-tile compile and add a few comments to tiles.

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

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

7HA2754QW3SBCAJ5K6KUXNXXXIZB5BIBCFPLXADCXHH6EREKXHSAC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/tutorial.cc at line 33 [6.5936]
[4.2282]
[5.1602]
```
#ifdef USE_TILE
#include "tiles.h"
#endif
```
Insertion in crawl-ref/source/tutorial.cc at line 426 [6.5936]
[5.13044]
[5.13044]
```
#ifndef USE_TILE
```
Insertion in crawl-ref/source/tutorial.cc at line 493 [6.5936]
[5.15817]
[5.15817]
```
#endif
```
Replacement in crawl-ref/source/tutorial.cc at line 510 [6.5936]
B:BD[5.16425] → [5.16425:16426]
[5.16425]
[2.425]
```
#ifndef USE_TILE
```
Insertion in crawl-ref/source/tutorial.cc at line 512 [6.5936]
[2.440]
[5.16450]
```
#endif
```
Insertion in crawl-ref/source/tutorial.cc at line 521 [6.5936]
[5.16573]
[2.441]
```
#ifndef USE_TILE
```
Replacement in crawl-ref/source/tutorial.cc at line 526 [6.5936]
∅:D[2.577] → [5.16829:16830]
B:BD[5.16829] → [5.16829:16830]
[2.577]
[5.16830]
```
#endif
```

Insertion in crawl-ref/source/tutorial.cc at line 532 [6.5936]

[2.640]

[5.16958]

#ifdef USE_TILE
        else if (i > 0 && i < 4)
            continue;
#else

Insertion in crawl-ref/source/tutorial.cc at line 542 [6.5936]
[5.17165]
[5.17165]
```
#endif
```
Insertion in crawl-ref/source/tutorial.cc at line 549 [6.5936]
[5.17293]
[2.641]
```
 #ifndef USE_TILE
```
Insertion in crawl-ref/source/tutorial.cc at line 551 [6.5936]
[2.670]
[5.17320]
```
 #endif
```
Insertion in crawl-ref/source/tutorial.cc at line 853 [6.5936]
[7.223]
[7.223]
```
#ifndef USE_TILE
```
Insertion in crawl-ref/source/tutorial.cc at line 864 [6.5936]
[5.27892]
[5.27892]
```
#endif
```
Insertion in crawl-ref/source/tutorial.cc at line 880 [6.5936]
[8.842]
[9.10804]
```
    std::string text = "<magenta>That ";
#ifndef USE_TILE
```
Deletion in crawl-ref/source/tutorial.cc at line 886 [6.5936]
∅:D[10.294] → [7.1583:1624]
B:BD[5.28400] → [7.1583:1624]
```
    std::string text = "<magenta>That ";
```

Replacement in crawl-ref/source/tutorial.cc at line 890 [6.5936]

B:BD[7.1828] → [8.843:1029]

            "<lightgray>b<magenta> or <brown>K<magenta>. You can gain information "
            "about it by pressing <w>x<magenta> and moving the cursor on the "
            "monster."

[7.1828]

[8.1029]

            "<lightgray>b<magenta> or <brown>K<magenta>. "
#else
    // need to highlight monster
    text += "monster is a ";
    text += mon.name(DESC_PLAIN).c_str();
    text += ". Examples for typical early monsters are: rat, "
            "giant newt, kobold and goblin. "
#endif
            "You can gain information about it by pressing <w>x<magenta> and "
            "moving the cursor on the monster."

Replacement in crawl-ref/source/tutorial.cc at line 904 [6.5936]
B:BD[5.28801] → [5.28801:28802]
[11.2289]
[5.28802]
```
    
```

Replacement in crawl-ref/source/tutorial.cc at line 934 [6.5936]

B:BD[5.30429] → [9.10955:10996]

∅:D[9.10996] → [7.2146:2184]

B:BD[7.2146] → [7.2146:2184]

B:BD[7.2184] → [8.1159:1236]

    unsigned ch;
    unsigned short col;
    get_item_glyph(&item, &ch, &col);
    if (ch == ' ') // happens if monster standing on dropped corpse or item

[5.30429]

[8.1236]

    // happens if monster standing on dropped corpse or item
    if (mgrd[item.x][item.y] != NON_MONSTER)

Insertion in crawl-ref/source/tutorial.cc at line 939 [6.5936]
[5.30470]
[7.2186]
```
#ifndef USE_TILE
```

Replacement in crawl-ref/source/tutorial.cc at line 942 [6.5936]

B:BD[7.2234] → [7.2234:2396]

B:BD[7.2396] → [11.2448:2529]

∅:D[11.2529] → [7.2478:2560]

B:BD[7.2478] → [7.2478:2560]

B:BD[7.2560] → [12.1103:1169]

    text += "<magenta> is an item. If you move there and press <w>g<magenta> or "
            "<w>,<magenta> you will pick it up. Generally, items are shown by "
            "non-letter symbols like <w>%?!\"=()[<magenta>. Once it is in your "
            "inventory, you can drop it again with <w>d<magenta>. Several types "
            "of objects will usually be picked up automatically."

[7.2234]

[12.1169]

    text += "<magenta>";
#endif
    text += "is an item. If you move there and press <w>g<magenta> or "
            "<w>,<magenta> you will pick it up. "
#ifndef USE_TILE
            "Generally, items are shown by "
            "non-letter symbols like <w>%?!\"=()[<magenta>. "
#endif
            "Once it is in your inventory, you can drop it again with "
            "<w>d<magenta>. Several types of objects will usually be picked up "
            "automatically."

Insertion in crawl-ref/source/tutorial.cc at line 974 [6.5936]

[13.7511]

[9.10997]

#ifndef USE_TILE
    const int ex = x - you.x_pos + 9;
    const int ey = y - you.y_pos + 9;

Deletion in crawl-ref/source/tutorial.cc at line 979 [6.5936]
∅:D[9.11041] → [7.2628:2704]
B:BD[5.31700] → [7.2628:2704]
```
    const int ex = x - you.x_pos + 9;
    const int ey = y - you.y_pos + 9;
```
Replacement in crawl-ref/source/tutorial.cc at line 980 [6.5936]
∅:D[7.2720] → [5.31700:31701]
B:BD[5.31700] → [5.31700:31701]
[7.2720]
[5.31701]
```
#endif
```

Replacement in crawl-ref/source/tutorial.cc at line 984 [6.5936]

B:BD[13.7550] → [13.7550:7627]

B:BD[13.7627] → [12.1292:1352]

          text << "You have picked up your first potion ('<w>!<magenta>'). "
                  "Use <w>q<magenta> to drink (quaff) it.";

[13.7550]

[5.31894]

          text << "You have picked up your first potion"
#ifndef USE_TILE
                  " ('<w>!<magenta>')"
#endif
                  ". Use <w>q<magenta> to drink (quaff) it.";

Replacement in crawl-ref/source/tutorial.cc at line 992 [6.5936]

B:BD[5.31939] → [13.7684:7761]

B:BD[13.7761] → [12.1365:1417]

          text << "You have picked up your first scroll ('<w>?<magenta>'). "
                  "Type <w>r<magenta> to read it.";

[5.31939]

[5.32068]

          text << "You have picked up your first scroll"
#ifndef USE_TILE
                  " ('<w>?<magenta>')"
#endif
                  ". Type <w>r<magenta> to read it.";

Replacement in crawl-ref/source/tutorial.cc at line 1000 [6.5936]

B:BD[5.32111] → [13.7810:7885]

B:BD[13.7885] → [12.1430:1481]

          text << "You have picked up your first wand ('<w>/<magenta>'). "
                  "Type <w>z<magenta> to zap it.";

[5.32111]

[5.32237]

          text << "You have picked up your first wand"
#ifndef USE_TILE
                  " ('<w>/<magenta>')"
#endif
                  ". Type <w>z<magenta> to zap it.";

Insertion in crawl-ref/source/tutorial.cc at line 1008 [6.5936]

[5.32282]

          text << "You have picked up a book "
#ifndef USE_TILE
                  "('<w>";

Replacement in crawl-ref/source/tutorial.cc at line 1012 [6.5936]

B:BD[5.32339] → [12.1494:1546]

∅:D[12.1546] → [13.7990:8030]

B:BD[13.7990] → [13.7990:8030]

B:BD[13.8030] → [12.1547:1623]

          text << "You have picked up a book ('<w>"
               << static_cast<char>(ch)
               << "'<magenta>) that you can read by typing <w>r<magenta>. "

[5.32339]

[12.1623]

          text << static_cast<char>(ch)
               << "'<magenta>) "
#endif
               << "that you can read by typing <w>r<magenta>. "

Replacement in crawl-ref/source/tutorial.cc at line 1038 [6.5936]

B:BD[5.32923] → [10.1613:1695]

          text << "This is the first weapon ('<w>(<magenta>') you've picked up. "

[5.32923]

[12.2347]

          text << "This is the first weapon "
#ifndef USE_TILE
                  "('<w>(<magenta>') "
#endif
                  "you've picked up. "

Replacement in crawl-ref/source/tutorial.cc at line 1080 [6.5936]

B:BD[5.34663] → [13.9149:9229]

∅:D[13.9229] → [5.34743:34934]

B:BD[5.34743] → [5.34743:34934]

          text << "This is the first piece of armour ('<w>[<magenta>') you've "
                  "picked up. Use <w>W<magenta> to wear it and <w>T<magenta> to "
                  "take it off again. You can view its properties with "
                  "<w>v<magenta>.";

[5.34663]

[5.34934]

          text << "This is the first piece of armour "
#ifndef USE_TILE
                  "('<w>[<magenta>') "
#endif
                  "you've picked up. Use <w>W<magenta> to wear it and "
                  "<w>T<magenta> to take it off again. You can view its "
                  "properties with <w>v<magenta>.";

Replacement in crawl-ref/source/tutorial.cc at line 1104 [6.5936]

B:BD[5.35642] → [13.9512:9596]

∅:D[11.2689] → [5.35727:35773]

∅:D[13.9596] → [5.35727:35773]

B:BD[5.35727] → [5.35727:35773]

          text << "You have picked up some food ('<w>%<magenta>'). You can eat it "
                  "by typing <w>e<magenta>.";

[5.35642]

[5.35773]

          text << "You have picked up some food"
#ifndef USE_TILE
                  " ('<w>%<magenta>')"
#endif
                  ". You can eat it by typing <w>e<magenta>.";

Replacement in crawl-ref/source/tutorial.cc at line 1112 [6.5936]

B:BD[5.35819] → [13.9597:9679]

∅:D[11.2772] → [5.35902:36132]

∅:D[13.9679] → [5.35902:36132]

B:BD[5.35902] → [5.35902:36132]

          text << "You have picked up a corpse ('<w>%<magenta>'). When a corpse "
                  "is lying on the ground, you can <w>D<magenta>issect with a "
                  "sharp implement. Once hungry you can <w>e<magenta>at the "
                  "resulting chunks (though they may not be healthy).";

[5.35819]

[12.2644]

          text << "You have picked up a corpse"
#ifndef USE_TILE
                  " ('<w>%<magenta>')"
#endif
                  ". When a corpse is lying on the ground, you can "
                  "<w>D<magenta>issect with a sharp implement. Once hungry you "
                  "can <w>e<magenta>at the resulting chunks (though they may "
                  "not be healthy).";

Replacement in crawl-ref/source/tutorial.cc at line 1133 [6.5936]

B:BD[5.36425] → [13.9846:9924]

∅:D[13.9924] → [5.36503:36798]

B:BD[5.36503] → [5.36503:36798]

          text << "You have picked up a a piece of jewellery, either a ring "
                  "('<w>=<magenta>') or an amulet ('<w>\"<magenta>'). Type "
                  "<w>P<magenta> to put it on and <w>R<magenta> to remove it. You "
                  "can view it with <w>v<magenta> although often magic is "
                  "necessary to reveal its true nature.";

[5.36425]

[5.36798]

          text << "You have picked up a a piece of jewellery, either a ring"
#ifndef USE_TILE
               << " ('<w>=<magenta>')"
#endif
               << " or an amulet"
#ifndef USE_TILE
               << " ('<w>\"<magenta>')"
#endif
               << ". Type <w>P<magenta> to put it on and <w>R<magenta> to remove "
                  "it. You can view it with <w>v<magenta> although often magic "
                  "is necessary to reveal its true nature.";

Insertion in crawl-ref/source/tutorial.cc at line 1153 [6.5936]

[5.37086]

          text << "You have picked up a magic staff or a rod"
#ifndef USE_TILE
                  ", both of which are represented by '<w>";

Replacement in crawl-ref/source/tutorial.cc at line 1157 [6.5936]

B:BD[5.37144] → [13.10008:10170]

B:BD[13.10170] → [14.1895:1975]

          text << "You have picked up a magic staff or a rod, both of which are "
                  "represented by '<w>"
               << static_cast<char>(ch)
               << "<magenta>'. Both must be <w>w<magenta>ielded to be of use. "

[5.37144]

[5.37417]

          text << static_cast<char>(ch)
               << "<magenta>'"
#endif
                  ". Both must be <w>w<magenta>ielded to be of use. "

Insertion in crawl-ref/source/tutorial.cc at line 1174 [6.5936]
[5.37869]
[7.2767]
```
          text << "These ";
#ifndef USE_TILE
```

Replacement in crawl-ref/source/tutorial.cc at line 1180 [6.5936]

B:BD[7.2897] → [15.1719:1794]

∅:D[15.1794] → [13.10328:10412]

B:BD[13.10328] → [13.10328:10412]

          text << "The " << colour_to_tag(colour) << static_cast<char>(ch)
               << "<magenta> are some downstairs. You can enter the next (deeper) "

[7.2897]

[5.38023]

          text << colour_to_tag(colour) << static_cast<char>(ch)
               << "<magenta> ";
#endif
          text << "are some downstairs. You can enter the next (deeper) "

Insertion in crawl-ref/source/tutorial.cc at line 1194 [6.5936]
[14.2032]
[15.1829]
```
          text << "These ";
#ifndef USE_TILE
```

Replacement in crawl-ref/source/tutorial.cc at line 1199 [6.5936]

B:BD[15.1958] → [15.1958:2047]

          
          text << "These " << colour_to_tag(colour) << static_cast<char>(ch);

[15.1958]

[15.2047]


          text << colour_to_tag(colour) << static_cast<char>(ch);

Replacement in crawl-ref/source/tutorial.cc at line 1203 [6.5936]

B:BD[15.2100] → [15.2100:2182]

          text << "<magenta> are some kind of escape hatch. You can use them to "

[15.2100]

[15.2182]

          text << "<magenta> ";
#endif
          text << "are some kind of escape hatch. You can use them to "

Insertion in crawl-ref/source/tutorial.cc at line 1211 [6.5936]

[14.2059]

[10.1775]

          text << "Oops... you just triggered a trap. An unwary adventurer will "
                  "occasionally stumble into one of these nasty constructions ";
#ifndef USE_TILE

Replacement in crawl-ref/source/tutorial.cc at line 1220 [6.5936]

∅:D[8.1331] → [13.10413:10495]

∅:D[10.1904] → [13.10413:10495]

B:BD[5.38263] → [13.10413:10495]

∅:D[16.474] → [5.38343:38423]

∅:D[13.10495] → [5.38343:38423]

B:BD[5.38343] → [5.38343:38423]

B:BD[5.38423] → [14.2060:2300]

          text << "Oops... you just triggered a trap. An unwary adventurer will "
                  "occasionally stumble into one of these nasty constructions "
                  "depicted by " << colour_to_tag(colour) << "^<magenta>. They "
                  "can do physical damage (with darts or needles, for example) "
                  "or have other, more magical effects, like teleportation.";

[8.1331]

[5.38635]

          text << "depicted by " << colour_to_tag(colour) << "^<magenta>"
#endif
          text << ". They can do physical damage (with darts or needles, for "
                  "example) or have other, more magical effects, like "
                  "teleportation.";

Insertion in crawl-ref/source/tutorial.cc at line 1228 [6.5936]
[5.38679]
[7.2962]
```
          text << "That ";
#ifndef USE_TILE
```

Replacement in crawl-ref/source/tutorial.cc at line 1233 [6.5936]

B:BD[7.3091] → [7.3091:3102]

B:BD[7.3102] → [13.10496:10660]

          
          text << "The " << colour_to_tag(colour) << static_cast<char>(ch)
               << "<magenta> is an altar. You can get information about it by pressing "

[7.3091]

[5.38841]


          text << colour_to_tag(colour) << static_cast<char>(ch) << "<magenta> ";
#endif
          text << "is an altar. You can get information about it by pressing "

Replacement in crawl-ref/source/tutorial.cc at line 1242 [6.5936]

B:BD[5.39042] → [17.793:868]

∅:D[17.868] → [13.10738:10807]

B:BD[13.10738] → [13.10738:10807]

B:BD[13.10807] → [12.3068:3105]

          text << "The <yellow>" << stringize_glyph(get_screen_glyph(x,y))
               << "<magenta> is a shop. You can enter it by typing "
                  "<w><<<magenta>.";

[5.39042]

[5.39202]

          text << "That "
#ifndef USE_TILE
                  "<yellow>" << stringize_glyph(get_screen_glyph(x,y))
               << "<magenta> "
#endif
                  "is a shop. You can enter it by typing <w><<<magenta>.";

Replacement in crawl-ref/source/tutorial.cc at line 1254 [6.5936]

B:BD[5.39298] → [17.869:939]

∅:D[17.939] → [13.10913:10998]

B:BD[13.10913] → [13.10913:10998]

          text << "The <w>" << stringize_glyph(get_screen_glyph(x,y))
               << "<magenta> is a closed door. You can open it by walking into it. "

[5.39298]

[5.39453]

          text << "That "
#ifndef USE_TILE
                  "<w>" << stringize_glyph(get_screen_glyph(x,y)) << "<magenta> "
#endif
                  "is a closed door. You can open it by walking into it. "

Insertion in crawl-ref/source/mon-util.cc at line 3747 [19.1699344]
[18.6842]
[3.2672]
```
#ifdef USE_TILE
```
Insertion in crawl-ref/source/mon-util.cc at line 3749 [19.1699344]
[3.2694]
[18.6842]
```
#endif    
```

Replacement in crawl-ref/source/libgui.h at line 94 [20.5789586]

B:BD[20.5791500] → [20.5791500:5791549]

    REGION_STAT,
    REGION_MSG,
    REGION_MAP,

[20.5791500]

[20.5791549]

    REGION_STAT,  // stat area
    REGION_MSG,   // message area
    REGION_MAP,   // overview map area

Replacement in crawl-ref/source/libgui.h at line 99 [20.5789586]
B:BD[20.5791584] → [20.5791584:5791618]
```
    REGION_INV1,
    REGION_INV2,
```
[20.5791584]
[20.5791618]
```
    REGION_INV1,  // items in inventory
    REGION_INV2,  // items in inventory?
```

Fix tutorial output for tile mode. For now, we simply suppress

Dependencies

In channels

Change contents

Insertion in crawl-ref/source/tutorial.cc at line 33 [6.5936]

Insertion in crawl-ref/source/tutorial.cc at line 426 [6.5936]

Insertion in crawl-ref/source/tutorial.cc at line 493 [6.5936]

Replacement in crawl-ref/source/tutorial.cc at line 510 [6.5936]

Insertion in crawl-ref/source/tutorial.cc at line 512 [6.5936]

Insertion in crawl-ref/source/tutorial.cc at line 521 [6.5936]

Replacement in crawl-ref/source/tutorial.cc at line 526 [6.5936]

Insertion in crawl-ref/source/tutorial.cc at line 532 [6.5936]

Insertion in crawl-ref/source/tutorial.cc at line 542 [6.5936]

Insertion in crawl-ref/source/tutorial.cc at line 549 [6.5936]

Insertion in crawl-ref/source/tutorial.cc at line 551 [6.5936]

Insertion in crawl-ref/source/tutorial.cc at line 853 [6.5936]

Insertion in crawl-ref/source/tutorial.cc at line 864 [6.5936]

Insertion in crawl-ref/source/tutorial.cc at line 880 [6.5936]

Deletion in crawl-ref/source/tutorial.cc at line 886 [6.5936]