fiddlerwoaroof/crawl - Change CKY7MRFWMNHXIPJD5ZUAJN5T2YHUIEAYBNYYV5GN74LBZJRDJMEQC

Fix 1914059: randart jewellery inconsistently described as {tried} by

         adding yet another entry to props.

FR 1949504: Move version information into the help scroller, yay! It also looks much nicer now (if I may say so). Go, take a look! :)

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

Created by j-p-e-g on May 25, 2008

CKY7MRFWMNHXIPJD5ZUAJN5T2YHUIEAYBNYYV5GN74LBZJRDJMEQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/tile1.cc at line 4460 [5.96318]

B:BD[5.218763] → [6.31156:31221]

∅:D[6.31221] → [5.218904:219001]

B:BD[5.218904] → [5.218904:219001]

        case OBJ_STAVES:
          id0 = id[ IDTYPE_STAVES ][s];
          if (id0 != ID_KNOWN_TYPE)
             return 1;
          else
             return 0;

[5.218763]

[7.4316]

    case OBJ_STAVES:
        id0 = id[ IDTYPE_STAVES ][s];
        if (id0 != ID_KNOWN_TYPE)
            return 1;
        else
            return 0;

Replacement in crawl-ref/source/tile1.cc at line 4467 [5.96318]

∅:D[7.4317] → [6.31236:31320]

B:BD[6.31236] → [6.31236:31320]

        case OBJ_SCROLLS:
          id0 = id[ IDTYPE_SCROLLS ][s];
          break;

[7.4317]

[5.219001]

    case OBJ_SCROLLS:
        id0 = id[ IDTYPE_SCROLLS ][s];
        break;

Replacement in crawl-ref/source/tile1.cc at line 4471 [5.96318]

B:BD[5.219002] → [5.219002:219065]

B:BD[5.219065] → [6.31321:31338]

        case OBJ_WANDS:
          id0 = id[ IDTYPE_WANDS ][s];
          break;

[5.219002]

[5.219236]

    case OBJ_WANDS:
        id0 = id[ IDTYPE_WANDS ][s];
        break;

Replacement in crawl-ref/source/tile1.cc at line 4475 [5.96318]

B:BD[5.219237] → [5.219237:219304]

B:BD[5.219304] → [6.31339:31356]

        case OBJ_POTIONS:
          id0 = id[ IDTYPE_POTIONS ][s];
          break;

[5.219237]

[5.219475]

    case OBJ_POTIONS:
        id0 = id[ IDTYPE_POTIONS ][s];
        break;

Replacement in crawl-ref/source/tile1.cc at line 4479 [5.96318]

B:BD[5.219476] → [5.219476:219547]

B:BD[5.219547] → [6.31357:31374]

        case OBJ_JEWELLERY:
          id0 = id[ IDTYPE_JEWELLERY ][s];
          break;

[5.219476]

[7.4318]

    case OBJ_JEWELLERY:
        if (is_artefact(item))
        {
            if (item.props.exists("jewellery_tried")
                && item.props["jewellery_tried"].get_bool())
            {
                return 2;
            }
            return 1;
        }
        id0 = id[ IDTYPE_JEWELLERY ][s];
        break;

Replacement in crawl-ref/source/tile1.cc at line 4492 [5.96318]
∅:D[7.4319] → [6.31385:31422]
B:BD[6.31385] → [6.31385:31422]
```
        default:
          return 0;
```
[7.4319]
[5.219644]
```
    default:
        return 0;
```

Replacement in crawl-ref/source/tile1.cc at line 4504 [5.96318]

B:BD[5.219667] → [5.219667:219726]

// Helper routine: sort floor item index and pack into idx

[5.219667]

[8.39494]

// Helper routine: sort floor item index and pack into idx.

Replacement in crawl-ref/source/randart.cc at line 371 [11.893152]

B:BD[9.672] → [10.412:487]

    if ( !force_fake_props && item_ident( item, ISFLAG_KNOW_PROPERTIES ) )

[9.672]

[9.726]

    if (!force_fake_props && item_ident( item, ISFLAG_KNOW_PROPERTIES ))

Replacement in crawl-ref/source/output.cc at line 1949 [11.1088282]

B:BD[12.2686] → [4.3595:3654]

static std::vector<formatted_string> _get_overview_cols1()

[12.2686]

[12.2792]

static std::vector<formatted_string> _get_overview_stats()

Replacement in crawl-ref/source/output.cc at line 2052 [11.1088282]

B:BD[13.55801] → [4.3746:3864]

static std::vector<formatted_string> _get_overview_cols2(
    std::vector<char> &equip_chars, bool calc_unid = false)

[13.55801]

[4.3864]

static std::vector<formatted_string> _get_overview_resistances(
    std::vector<char> &equip_chars,
    bool calc_unid = false)

Replacement in crawl-ref/source/output.cc at line 2177 [11.1088282]

B:BD[14.3053] → [4.4444:4514]

        std::vector<formatted_string> blines = _get_overview_cols1();

[14.3053]

[4.4514]

        std::vector<formatted_string> blines = _get_overview_stats();

Replacement in crawl-ref/source/output.cc at line 2186 [11.1088282]

B:BD[4.4716] → [4.4716:4875]

        std::vector<formatted_string> blines = _get_overview_cols2(equip_chars,
                                                                   calc_unid);

[4.4716]

[12.3505]

        std::vector<formatted_string> blines =
            _get_overview_resistances(equip_chars, calc_unid);

Replacement in crawl-ref/source/output.cc at line 2210 [11.1088282]

B:BD[4.5027] → [4.5027:5093]

    std::vector<formatted_string> blines = _get_overview_cols1();

[4.5027]

[4.5093]

    std::vector<formatted_string> blines = _get_overview_stats();

Replacement in crawl-ref/source/output.cc at line 2219 [11.1088282]

B:BD[4.5259] → [4.5259:5315]

    blines = _get_overview_cols2(equip_chars, full_id);

[4.5259]

[4.5315]

    blines = _get_overview_resistances(equip_chars, full_id);

Replacement in crawl-ref/source/itemname.cc at line 1710 [11.2667494]

B:BD[15.1636] → [15.1636:1691]

    if ( item_type_known(item) )
        return false;

[15.1636]

[11.2745834]

    if (item_type_known(item))
        return (false);

Replacement in crawl-ref/source/itemname.cc at line 1713 [11.2667494]
B:BD[15.1785] → [15.1785:1814]
```
    if ( is_artefact(item) )
```
[11.2745835]
[16.6359]
```
    if (is_artefact(item) && item.base_type == OBJ_JEWELLERY)
```

Replacement in crawl-ref/source/itemname.cc at line 1716 [11.2667494]

B:BD[16.6409] → [16.6409:6459]

            && _randart_has_known_property(item))

[16.6409]

[16.6459]

            && item.props.exists("jewellery_tried")
            && item.props["jewellery_tried"].get_bool())

Replacement in crawl-ref/source/itemname.cc at line 1719 [11.2667494]
B:BD[16.6469] → [16.6469:6494]
```
            return true;
```
[16.6469]
[16.6494]
```
            return (true);
```
Replacement in crawl-ref/source/itemname.cc at line 1721 [11.2667494]
∅:D[16.6504] → [15.1814:1836]
B:BD[15.1814] → [15.1814:1836]
```
        return false;
```
[16.6504]
[16.6505]
```
        return (false);
```
Replacement in crawl-ref/source/itemname.cc at line 1731 [11.2667494]
B:BD[15.2030] → [15.2030:2052]
```
        return false;
```
[15.2030]
[15.2052]
```
        return (false);
```

Replacement in crawl-ref/source/item_use.cc at line 2619 [11.2781507]

B:BD[11.2833498] → [2.2742:2861]

∅:D[2.2861] → [17.1974:2020]

B:BD[17.1974] → [17.1974:2020]

    // Randart jewellery shouldn't auto-ID just because the
    // base type is known. Somehow the player should still
    // be told, preferably by message. (jpeg)

[11.2833498]

[18.15147]

    // Randart jewellery shouldn't auto-ID just because the base type
    // is known. Somehow the player should still be told, preferably
    // by message. (jpeg)

Insertion in crawl-ref/source/item_use.cc at line 2764 [11.2781507]

[9.3049]


        if (!item.props.exists("jewellery_tried")
            || !item.props["jewellery_tried"].get_bool())
        {
            item.props["jewellery_tried"].get_bool() = true;
        }

Deletion in crawl-ref/source/enum.h at line 483 [11.3287960]
B:BD[11.3304594] → [11.3304594:3304615]
```
    CMD_GET_VERSION,
```
Replacement in crawl-ref/source/command.h at line 23 [11.4080838]
B:BD[11.4081519] → [11.4081519:4081539]
```
void version(void);
```
[11.4081519]
[11.4081539]
```
void print_version(void);
```
Insertion in crawl-ref/source/command.cc at line 66 [11.4082507]
[19.318]
[20.479603]
```
#endif
#ifdef USE_TILE
    "Tile support",
```
Insertion in crawl-ref/source/command.cc at line 76 [11.4082507]
[21.28429]
[20.479611]
```
#ifdef DEBUG
    "Debug mode",
#endif
```
Insertion in crawl-ref/source/command.cc at line 92 [11.4082507]
[22.402]
[22.402]
```
#ifdef DGL_MILESTONES
    "Milestones",
#endif
```

Insertion in crawl-ref/source/command.cc at line 99 [11.4082507]

[5.5936244]

};
static std::string _get_version_information(void)
{
    std::string result  = "This is <w>";
                result += CRAWL " " VERSION "</w> (" VERSION_DETAIL ").";
    result += "\n\n";

Replacement in crawl-ref/source/command.cc at line 107 [11.4082507]

B:BD[5.5936245] → [5.5936245:5936281]

∅:D[5.5936281] → [22.446:453]

B:BD[22.446] → [22.446:453]

∅:D[22.453] → [20.479737:479740]

B:BD[20.479737] → [20.479737:479740]

#ifdef USE_TILE
    "Tile support",
#endif
};

[5.5936245]

[20.479740]

    return (result);
}
static std::string _get_version_features(void)
{
    std::string result  = "FEATURES" EOL;
                result += "--------" EOL;
    for (unsigned int i = 0; i < ARRAYSZ(features); i++)
    {
        result += " * ";
        result += features[i];
        result += EOL;
    }
    result += "\n\n";
    return (result);
}
static void _add_file_to_scroller(FILE* fp, formatted_scroller& m,
                                  int first_hotkey  = 0,
                                  bool auto_hotkeys = false);

Replacement in crawl-ref/source/command.cc at line 130 [11.4082507]
∅:D[20.479741] → [11.4083555:4083574]
B:BD[11.4083555] → [11.4083555:4083574]
```
void version(void)
```
[20.479741]
[11.4083574]
```
void print_version(void)
```

Replacement in crawl-ref/source/command.cc at line 132 [11.4082507]

B:BD[11.4083576] → [23.751:817]

B:BD[23.817] → [22.454:479]

B:BD[22.479] → [24.8856:8926]

∅:D[24.8926] → [22.551:575]

B:BD[22.551] → [22.551:575]

∅:D[22.575] → [11.4083653:4083702]

∅:D[20.479975] → [11.4083653:4083702]

B:BD[11.4083653] → [11.4083653:4083702]

    mpr( "This is " CRAWL " " VERSION " (" VERSION_DETAIL ")." );
    mprf("Features: %s",
         comma_separated_line(features, features + ARRAYSZ(features))
             .c_str());
}                               // end version()

[11.4083576]

[11.4083702]

    formatted_scroller cmd_version;
    // Set flags.
    int flags = MF_NOSELECT | MF_ALWAYS_SHOW_MORE | MF_NOWRAP | MF_EASY_EXIT;
    cmd_version.set_flags(flags, false);
    cmd_version.set_tag("version");
    // FIXME: Allow for hiding Page down when at the end of the listing, ditto
    // for page up at start of listing.
    cmd_version.set_more( formatted_string::parse_string(
                              "<cyan>[ + : Page down.   - : Page up."
                              "                           Esc exits.]") );
    cmd_version.add_text(_get_version_information());
    cmd_version.add_text(_get_version_features());
    // Read in information about changed in comparison to the latest version.
    FILE* fp = fopen(datafile_path("034_changes.txt", true).c_str(), "r");
    if (fp)
    {
        char buf[200];
        bool first = true;
        while (fgets(buf, sizeof buf, fp))
        {
            // Remove trailing spaces.
            for (int i = strlen(buf) - 1; i >= 0; i++)
            {
                if (isspace( buf[i] ))
                    buf[i] = 0;
                else
                    break;
            }
            if (first)
            {
                // Highlight the first line (title).
                std::string text  = "<w>";
                            text += buf;
                            text += "</w>";
                cmd_version.add_text(text);
                first = false;
            }
            else
                cmd_version.add_text(buf);
        }
    }
    fclose(fp);

Insertion in crawl-ref/source/command.cc at line 179 [11.4082507]
[11.4083703]
[11.4083703]
```
    cmd_version.show();
}
```

Replacement in crawl-ref/source/command.cc at line 257 [11.4082507]

B:BD[11.4084572] → [25.1186199:1186233]

B:BD[25.1186233] → [21.28432:28562]

∅:D[21.28562] → [25.1186369:1186398]

B:BD[25.1186369] → [25.1186369:1186398]

    to_slot = prompt_invent_item(
                    "Adjust to which letter?",
                    MT_INVLIST,
                    -1,
                    false,
                    false );

[11.4084572]

[26.369]

    to_slot = prompt_invent_item( "Adjust to which letter?",
                                  MT_INVLIST,
                                  -1,
                                  false,
                                  false );

Replacement in crawl-ref/source/command.cc at line 678 [11.4082507]

B:BD[3.12784] → [3.12784:12856]

                                  int first_hotkey, bool auto_hotkeys )

[3.12784]

[27.2042]

                                  int first_hotkey, bool auto_hotkeys)

Replacement in crawl-ref/source/command.cc at line 684 [11.4082507]

B:BD[28.1834] → [28.1834:1918]

    // bracket with MEL_TITLES, so that you won't scroll
    // into it or above it

[28.1834]

[28.1918]

    // Bracket with MEL_TITLES, so that you won't scroll into it or above it.

Replacement in crawl-ref/source/command.cc at line 686 [11.4082507]
B:BD[28.1976] → [28.1976:2030]
```
    for ( int i = 0; i < get_number_of_lines(); ++i )
```
[28.1976]
[28.2030]
```
    for (int i = 0; i < get_number_of_lines(); ++i)
```

Replacement in crawl-ref/source/command.cc at line 693 [11.4082507]

B:BD[27.2211] → [29.186:298]

        if ((next_is_hotkey && (isupper(buf[0]) || isdigit(buf[0]))) ||
            (is_first && first_hotkey))

[27.2211]

[27.2290]

        if (next_is_hotkey && (isupper(buf[0]) || isdigit(buf[0]))
            || is_first && first_hotkey)

Replacement in crawl-ref/source/command.cc at line 696 [11.4082507]

B:BD[27.2300] → [29.299:358]

∅:D[29.358] → [30.493:595]

B:BD[30.493] → [30.493:595]

            int hotkey = is_first ? first_hotkey : buf[0];
            if ( !is_first && buf[0] == 'X' &&
                 strlen(buf) >= 3 && isdigit(buf[2]) )

[27.2300]

[30.595]

            int hotkey = (is_first ? first_hotkey : buf[0]);
            if (!is_first && buf[0] == 'X'
                && strlen(buf) >= 3 && isdigit(buf[2]))

Replacement in crawl-ref/source/command.cc at line 704 [11.4082507]
B:BD[30.736] → [29.359:394]
```
            if ( isupper(hotkey) )
```
[30.736]
[29.394]
```
            if (isupper(hotkey))
```
Replacement in crawl-ref/source/command.cc at line 706 [11.4082507]
∅:D[29.443] → [31.257:295]
∅:D[30.736] → [31.257:295]
B:BD[27.2371] → [31.257:295]
```
            me->level = MEL_SUBTITLE;
```
[29.443]
[27.2406]
```
            me->level  = MEL_SUBTITLE;
```

Replacement in crawl-ref/source/command.cc at line 710 [11.4082507]

B:BD[27.2473] → [27.2473:2543]

        // XXX FIXME: there must be a better way to identify sections

[27.2473]

[27.2543]

        // FIXME: There must be a better way to identify sections!

Replacement in crawl-ref/source/command.cc at line 1340 [11.4082507]

B:BD[21.28756] → [3.14733:14799]

            if (_find_description(again, error) && getch() == 0 )

[21.28756]

[21.28821]

            if (_find_description(again, error) && getch() == 0)

Insertion in crawl-ref/source/command.cc at line 1350 [11.4082507]

[32.1486]

[33.3378]

        return -1;
      }
      case 'v':
      case 'V':
      {
        print_version();

Replacement in crawl-ref/source/command.cc at line 1422 [11.4082507]
∅:D[34.2451] → [27.2876:2899]
B:BD[25.1188371] → [27.2876:2899]
```
    if ( with_manual )
```
[34.2451]
[34.2452]
```
    if (with_manual)
```
Replacement in crawl-ref/source/command.cc at line 1479 [11.4082507]
B:BD[34.3119] → [34.3119:3164]
```
        for (i = 0; i < blines.size(); ++i )
```
[34.3119]
[34.3164]
```
        for (i = 0; i < blines.size(); ++i)
```

Replacement in crawl-ref/source/command.cc at line 1482 [11.4082507]

B:BD[34.3224] → [34.3224:3288]

        while ( static_cast<int>(++i) < get_number_of_lines() )

[34.3224]

[34.3288]

        while (static_cast<int>(++i) < get_number_of_lines())

Insertion in crawl-ref/source/command.cc at line 1484 [11.4082507]
[34.3330]
[30.2162]
Replacement in crawl-ref/source/command.cc at line 1489 [11.4082507]
B:BD[25.1188912] → [35.289:338]
```
    for (unsigned i = 0; i < lines.size(); ++i )
```
[25.1188912]
[34.3337]
```
    for (unsigned i = 0; i < lines.size(); ++i)
```
Replacement in crawl-ref/source/command.cc at line 1492 [11.4082507]
B:BD[27.3320] → [27.3320:3343]
```
    if ( with_manual )
```
[27.3320]
[27.3343]
```
    if (with_manual)
```

Replacement in crawl-ref/source/command.cc at line 1494 [11.4082507]

B:BD[27.3349] → [34.3413:3472]

        for ( int i = 0; help_files[i].name != NULL; ++i )

[27.3349]

[27.3607]

        for (int i = 0; help_files[i].name != NULL; ++i)

Replacement in crawl-ref/source/command.cc at line 1496 [11.4082507]

B:BD[27.3617] → [30.2256:2322]

            // attempt to open this file, skip it if unsuccessful

[27.3617]

[36.26775]

            // Attempt to open this file, skip it if unsuccessful.

Replacement in crawl-ref/source/command.cc at line 1499 [11.4082507]
∅:D[30.2401] → [34.3561:3584]
∅:D[36.26897] → [34.3561:3584]
B:BD[34.3561] → [34.3561:3584]
```
            if ( !fp )
```
[30.2401]
[34.3584]
```
            if (!fp)
```
Replacement in crawl-ref/source/command.cc at line 1516 [11.4082507]
B:BD[37.670] → [37.670:688]
```
    if ( hotkey )
```
[37.670]
[37.688]
```
    if (hotkey)
```
Deletion in crawl-ref/source/chardump.cc at line 694 [11.4100336]
B:BD[11.4111780] → [11.4111780:4111786]
```
    {
```
Deletion in crawl-ref/source/chardump.cc at line 695 [11.4100336]
B:BD[11.4111813] → [11.4111813:4111819]
```
    }
```

Replacement in crawl-ref/source/chardump.cc at line 762 [11.4100336]

B:BD[20.547556] → [20.547556:547627]

                                && dump_item_origin(you.inv[j], ival))

[20.547556]

[20.547627]

                            && dump_item_origin(you.inv[j], ival))

Replacement in crawl-ref/source/chardump.cc at line 1038 [11.4100336]

B:BD[38.24213] → [38.24213:24981]

"Table legend:\n"
" A = Kills in this place as a percentage of kills in entire the game.\n"
" B = Kills by you in this place as a percentage of kills by you in\n"
"     the entire game.\n"
" C = Kills by friends in this place as a percentage of kills by\n"
"     friends in the entire game.\n"
" D = Other kills in this place as a percentage of other kills in the\n"
"     entire game.\n"
" E = Character level experience gained in this place as a percentage of\n"
"     character level experience gained in the entire game.\n"
" F = Skills experience gained in this place as a percentage of skills\n"
"     experience gained in the entire game.\n"
" G = Experience gained in this place divided by the number of levels of\n"
"     this place that you have seen.\n\n";

[38.24213]

[38.24981]

    "Table legend:\n"
    " A = Kills in this place as a percentage of kills in entire the game.\n"
    " B = Kills by you in this place as a percentage of kills by you in\n"
    "     the entire game.\n"
    " C = Kills by friends in this place as a percentage of kills by\n"
    "     friends in the entire game.\n"
    " D = Other kills in this place as a percentage of other kills in the\n"
    "     entire game.\n"
    " E = Character level experience gained in this place as a percentage of\n"
    "     character level experience gained in the entire game.\n"
    " F = Skills experience gained in this place as a percentage of skills\n"
    "     experience gained in the entire game.\n"
    " G = Experience gained in this place divided by the number of levels of\n"
    "     this place that you have seen.\n\n";

Replacement in crawl-ref/source/chardump.cc at line 1120 [11.4100336]

B:BD[20.548203] → [20.548203:548368]

             (you.hunger <= 2600) ? "hungry" :
             (you.hunger < 7000) ? "not hungry" :
             (you.hunger < 11000) ? "full" : "completely stuffed");

[20.548203]

[39.2208]

            (you.hunger <= 2600) ? "hungry" :
            (you.hunger <  7000) ? "not hungry" :
            (you.hunger < 11000) ? "full"
                                 : "completely stuffed");

Replacement in crawl-ref/source/chardump.cc at line 1128 [11.4100336]

B:BD[39.2251] → [39.2251:2273]

∅:D[40.630] → [41.905:963]

B:BD[39.2273] → [41.905:963]

B:BD[41.963] → [42.3136:3196]

    std::string dir =
        !Options.morgue_dir.empty()? Options.morgue_dir :
        !SysEnv.crawl_dir.empty()  ? SysEnv.crawl_dir : "";

[39.2251]

[39.2388]

    std::string dir = (!Options.morgue_dir.empty() ? Options.morgue_dir :
                       !SysEnv.crawl_dir.empty()   ? SysEnv.crawl_dir
                                                   : "");

Replacement in crawl-ref/source/chardump.cc at line 1153 [11.4100336]

B:BD[43.660] → [43.660:916]

                if ( i > max_x )
                    max_x = i;
                if ( i < min_x )
                    min_x = i;
                if ( j > max_y )
                    max_y = j;
                if ( j < min_y )
                    min_y = j;

[43.660]

[43.916]

                if (i > max_x) max_x = i;
                if (i < min_x) min_x = i;
                if (j > max_y) max_y = j;
                if (j < min_y) min_y = j;

Replacement in crawl-ref/source/chardump.cc at line 1159 [11.4100336]
∅:D[7.24661] → [44.568:611]
B:BD[43.935] → [44.568:611]
```
    for ( int y = min_y; y <= max_y; ++y )
```
[7.24661]
[43.977]
```
    for (int y = min_y; y <= max_y; ++y)
```
Replacement in crawl-ref/source/chardump.cc at line 1161 [11.4100336]
B:BD[43.983] → [44.612:659]
```
        for ( int x = min_x; x <= max_x; ++x )
```
[43.983]
[43.1029]
```
        for (int x = min_x; x <= max_x; ++x)
```
Insertion in crawl-ref/source/chardump.cc at line 1163 [11.4100336]
[43.1077]
[43.1077]
Replacement in crawl-ref/source/chardump.cc at line 1175 [11.4100336]
B:BD[45.12415] → [45.12415:12430]
```
    if ( !fp )
```
[45.12415]
[45.12430]
```
    if (!fp)
```
Replacement in crawl-ref/source/chardump.cc at line 1183 [11.4100336]
∅:D[45.12489] → [25.1217897:1217921]
B:BD[20.548371] → [25.1217897:1217921]
B:BD[25.1217921] → [46.6024:6084]
```
static bool write_dump(
        const std::string &fname,
        dump_params &par)
```
[45.12489]
[11.4121379]
```
static bool write_dump( const std::string &fname, dump_params &par)
```
Replacement in crawl-ref/source/chardump.cc at line 1222 [11.4100336]
∅:D[47.3382] → [48.463:525]
B:BD[49.15553] → [48.463:525]
∅:D[50.479] → [49.15616:15674]
∅:D[48.525] → [49.15616:15674]
B:BD[49.15616] → [49.15616:15674]
```
    scr.set_title( new MenuEntry("Turn   | Place   | Note"));
    for ( unsigned int i = 0; i < note_list.size(); ++i )
```
[47.3382]
[49.15674]
```
    scr.set_title(new MenuEntry("Turn   | Place   | Note"));
    for (unsigned int i = 0; i < note_list.size(); ++i)
```
Replacement in crawl-ref/source/chardump.cc at line 1227 [11.4100336]
B:BD[49.15823] → [49.15823:15853]
```
        if ( suffix.empty() )
```
[49.15823]
[49.15853]
```
        if (suffix.empty())
```
Insertion in crawl-ref/source/chardump.cc at line 1229 [11.4100336]
[49.15875]
[49.15875]
Replacement in crawl-ref/source/chardump.cc at line 1231 [11.4100336]
B:BD[49.15943] → [49.15943:15973]
```
        if ( spaceleft <= 0 )
```
[49.15943]
[49.15973]
```
        if (spaceleft <= 0)
```
Insertion in crawl-ref/source/chardump.cc at line 1233 [11.4100336]
[49.15993]
[49.15993]

Replacement in crawl-ref/source/chardump.cc at line 1236 [11.4100336]

B:BD[49.16122] → [51.5071:5135]

        if ( parts.empty() ) // disregard pure-whitespace notes

[49.16122]

[52.373]

        if (parts.empty()) // disregard pure-whitespace notes

Insertion in crawl-ref/source/chardump.cc at line 1238 [11.4100336]
[52.395]
[49.16122]
Insertion in crawl-ref/source/chardump.cc at line 1241 [11.4100336]
[49.16237]
[49.16237]
```
        {
```
Replacement in crawl-ref/source/chardump.cc at line 1244 [11.4100336]
B:BD[49.16387] → [49.16387:16388]
[49.16387]
[25.1218713]
```
        }
```
Deletion in crawl-ref/source/acr.cc at line 1226 [11.4397395]
B:BD[53.25274] → [53.25274:25300]
```
    case CMD_GET_VERSION:
```
Deletion in crawl-ref/source/acr.cc at line 2363 [11.4397395]
B:BD[11.4437230] → [11.4437230:4437291]
```
    case CMD_GET_VERSION:
        version();
        break;
```
Replacement in crawl-ref/source/acr.cc at line 3373 [11.4397395]
B:BD[25.1274318] → [25.1274318:1274356]
```
    case 'V': return CMD_GET_VERSION;
```
[25.1274318]
[25.1274356]
```
    case 'V': return CMD_NO_CMD;
```

Fix 1914059: randart jewellery inconsistently described as {tried} by

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/tile1.cc at line 4460 [5.96318]

Replacement in crawl-ref/source/tile1.cc at line 4467 [5.96318]

Replacement in crawl-ref/source/tile1.cc at line 4471 [5.96318]

Replacement in crawl-ref/source/tile1.cc at line 4475 [5.96318]

Replacement in crawl-ref/source/tile1.cc at line 4479 [5.96318]

Replacement in crawl-ref/source/tile1.cc at line 4492 [5.96318]

Replacement in crawl-ref/source/tile1.cc at line 4504 [5.96318]

Replacement in crawl-ref/source/randart.cc at line 371 [11.893152]

Replacement in crawl-ref/source/output.cc at line 1949 [11.1088282]

Replacement in crawl-ref/source/output.cc at line 2052 [11.1088282]

Replacement in crawl-ref/source/output.cc at line 2177 [11.1088282]

Replacement in crawl-ref/source/output.cc at line 2186 [11.1088282]

Replacement in crawl-ref/source/output.cc at line 2210 [11.1088282]

Replacement in crawl-ref/source/output.cc at line 2219 [11.1088282]

Replacement in crawl-ref/source/itemname.cc at line 1710 [11.2667494]

Replacement in crawl-ref/source/itemname.cc at line 1713 [11.2667494]

Replacement in crawl-ref/source/itemname.cc at line 1716 [11.2667494]

Replacement in crawl-ref/source/itemname.cc at line 1719 [11.2667494]

Replacement in crawl-ref/source/itemname.cc at line 1721 [11.2667494]

Replacement in crawl-ref/source/itemname.cc at line 1731 [11.2667494]

Replacement in crawl-ref/source/item_use.cc at line 2619 [11.2781507]

Insertion in crawl-ref/source/item_use.cc at line 2764 [11.2781507]

Deletion in crawl-ref/source/enum.h at line 483 [11.3287960]

Replacement in crawl-ref/source/command.h at line 23 [11.4080838]

Insertion in crawl-ref/source/command.cc at line 66 [11.4082507]

Insertion in crawl-ref/source/command.cc at line 76 [11.4082507]

Insertion in crawl-ref/source/command.cc at line 92 [11.4082507]

Insertion in crawl-ref/source/command.cc at line 99 [11.4082507]

Replacement in crawl-ref/source/command.cc at line 107 [11.4082507]

Replacement in crawl-ref/source/command.cc at line 130 [11.4082507]

Replacement in crawl-ref/source/command.cc at line 132 [11.4082507]

Insertion in crawl-ref/source/command.cc at line 179 [11.4082507]

Replacement in crawl-ref/source/command.cc at line 257 [11.4082507]

Replacement in crawl-ref/source/command.cc at line 678 [11.4082507]

Replacement in crawl-ref/source/command.cc at line 684 [11.4082507]

Replacement in crawl-ref/source/command.cc at line 686 [11.4082507]

Replacement in crawl-ref/source/command.cc at line 693 [11.4082507]

Replacement in crawl-ref/source/command.cc at line 696 [11.4082507]

Replacement in crawl-ref/source/command.cc at line 704 [11.4082507]

Replacement in crawl-ref/source/command.cc at line 706 [11.4082507]

Replacement in crawl-ref/source/command.cc at line 710 [11.4082507]

Replacement in crawl-ref/source/command.cc at line 1340 [11.4082507]

Insertion in crawl-ref/source/command.cc at line 1350 [11.4082507]

Replacement in crawl-ref/source/command.cc at line 1422 [11.4082507]

Replacement in crawl-ref/source/command.cc at line 1479 [11.4082507]

Replacement in crawl-ref/source/command.cc at line 1482 [11.4082507]

Insertion in crawl-ref/source/command.cc at line 1484 [11.4082507]

Replacement in crawl-ref/source/command.cc at line 1489 [11.4082507]

Replacement in crawl-ref/source/command.cc at line 1492 [11.4082507]

Replacement in crawl-ref/source/command.cc at line 1494 [11.4082507]

Replacement in crawl-ref/source/command.cc at line 1496 [11.4082507]

Replacement in crawl-ref/source/command.cc at line 1499 [11.4082507]

Replacement in crawl-ref/source/command.cc at line 1516 [11.4082507]

Deletion in crawl-ref/source/chardump.cc at line 694 [11.4100336]

Deletion in crawl-ref/source/chardump.cc at line 695 [11.4100336]

Replacement in crawl-ref/source/chardump.cc at line 762 [11.4100336]

Replacement in crawl-ref/source/chardump.cc at line 1038 [11.4100336]

Replacement in crawl-ref/source/chardump.cc at line 1120 [11.4100336]

Replacement in crawl-ref/source/chardump.cc at line 1128 [11.4100336]

Replacement in crawl-ref/source/chardump.cc at line 1153 [11.4100336]

Replacement in crawl-ref/source/chardump.cc at line 1159 [11.4100336]

Replacement in crawl-ref/source/chardump.cc at line 1161 [11.4100336]

Insertion in crawl-ref/source/chardump.cc at line 1163 [11.4100336]

Replacement in crawl-ref/source/chardump.cc at line 1175 [11.4100336]

Replacement in crawl-ref/source/chardump.cc at line 1183 [11.4100336]

Replacement in crawl-ref/source/chardump.cc at line 1222 [11.4100336]

Replacement in crawl-ref/source/chardump.cc at line 1227 [11.4100336]

Insertion in crawl-ref/source/chardump.cc at line 1229 [11.4100336]

Replacement in crawl-ref/source/chardump.cc at line 1231 [11.4100336]

Insertion in crawl-ref/source/chardump.cc at line 1233 [11.4100336]

Replacement in crawl-ref/source/chardump.cc at line 1236 [11.4100336]

Insertion in crawl-ref/source/chardump.cc at line 1238 [11.4100336]

Insertion in crawl-ref/source/chardump.cc at line 1241 [11.4100336]

Replacement in crawl-ref/source/chardump.cc at line 1244 [11.4100336]

Deletion in crawl-ref/source/acr.cc at line 1226 [11.4397395]

Deletion in crawl-ref/source/acr.cc at line 2363 [11.4397395]