fiddlerwoaroof/crawl - Change 6ASOOHD6K27UHPOPJEFCYBKXTH4RIW63IGQV6VKNTSSSCTAXHPIAC

Fix [2644366]: place a space between prefixes and the item name.

Also, fix the documentation which used to say that the prefixes are comma-separated (they're not.)

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

Created by haranp on February 28, 2009

6ASOOHD6K27UHPOPJEFCYBKXTH4RIW63IGQV6VKNTSSSCTAXHPIAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/items.cc at line 2296 [6.2584728]

B:BD[4.2279] → [5.2631:2681]

           + menu_colour_item_prefix(item, false)

[4.2279]

[5.2681]

           + menu_colour_item_prefix(item, false) + " "

Replacement in crawl-ref/source/itemname.h at line 117 [6.2661173]

B:BD[6.2667210] → [7.2812:3011]

B:BD[7.3011] → [5.2912:3037]

B:BD[5.3037] → [3.2839:2960]

∅:D[3.2960] → [8.4835:4973]

∅:D[5.3037] → [8.4835:4973]

B:BD[7.3076] → [8.4835:4973]

B:BD[8.4973] → [9.3130:3342]

/* ***********************************************************************
 * called from: command - itemname - invent.h
 * *********************************************************************** */
const std::string menu_colour_item_prefix(const item_def &item,
                                          bool temp = true);
const std::string filtering_item_prefix(const item_def &item,
                                        bool temp = true);
const std::string get_menu_colour_prefix_tags(item_def &item,
                                              description_level_type desc);
const std::string get_message_colour_tags(item_def &item,
                                          description_level_type desc,
                                          msg_channel_type channel = MSGCH_PLAIN);

[6.2667210]

[7.3076]

std::string menu_colour_item_prefix(const item_def &item, bool temp = true);
std::string filtering_item_prefix(const item_def &item, bool temp = true);
std::string get_menu_colour_prefix_tags(const item_def &item,
                                        description_level_type desc);
std::string get_message_colour_tags(const item_def &item,
                                    description_level_type desc,
                                    msg_channel_type channel = MSGCH_PLAIN);

Deletion in crawl-ref/source/itemname.h at line 130 [6.2661173]

B:BD[10.2952] → [2.6765:6942]

/* ***********************************************************************
 * called from: newgame
 * *********************************************************************** */

Replacement in crawl-ref/source/itemname.cc at line 2251 [6.2667494]

B:BD[6.2777145] → [11.2882:2949]

    const std::string iname = menu_colour_item_prefix(item, false)

[6.2777145]

[12.2655]

    const std::string iname = menu_colour_item_prefix(item, false) + " "

Replacement in crawl-ref/source/itemname.cc at line 2768 [6.2667494]

B:BD[3.3584] → [3.3584:3659]

const std::string menu_colour_item_prefix(const item_def &item, bool temp)

[3.3584]

[3.3659]

std::string menu_colour_item_prefix(const item_def &item, bool temp)

Replacement in crawl-ref/source/itemname.cc at line 2773 [6.2667494]

B:BD[10.6655] → [3.3706:3779]

const std::string filtering_item_prefix(const item_def &item, bool temp)

[10.6655]

[3.3779]

std::string filtering_item_prefix(const item_def &item, bool temp)

Replacement in crawl-ref/source/itemname.cc at line 2778 [6.2667494]

∅:D[3.3827] → [8.4998:5135]

B:BD[10.6655] → [8.4998:5135]

const std::string get_menu_colour_prefix_tags(item_def &item,
                                              description_level_type desc)

[3.3827]

[8.5135]

std::string get_menu_colour_prefix_tags(const item_def &item,
                                        description_level_type desc)

Replacement in crawl-ref/source/itemname.cc at line 2801 [6.2667494]

B:BD[8.5669] → [9.3344:3541]

const std::string get_message_colour_tags(item_def &item,
                                          description_level_type desc,
                                          msg_channel_type channel)

[8.5669]

[9.3541]

std::string get_message_colour_tags(const item_def &item,
                                    description_level_type desc,
                                    msg_channel_type channel)

Replacement in crawl-ref/docs/options_guide.txt at line 1334 [14.63392]

B:BD[13.20161] → [13.20161:20215]

B:BD[13.20215] → [15.6208:6279]

           identified, evil_item wand of draining (4)
           unidentified, equipped, artefact sparkling ring (left hand)

[13.20161]

[5.5741]

           identified evil_item wand of draining (4)
           unidentified equipped artefact sparkling ring (left hand)