fiddlerwoaroof/crawl - Change X3RDT655FEYO6XEVPIUAPEPJZAFE55KZBH2AZOLK3NGHINMVIGFQC

Added add_glyph methods to formatted string to show a monster or item glyph as

displayed on screen. Still is a bit messy to use, and you must initialise the formatted_string with a base colour before using add_glyph(), or the formatted_string will reset to lightgrey after the glyph.

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

Created by dshaligram on January 28, 2007

X3RDT655FEYO6XEVPIUAPEPJZAFE55KZBH2AZOLK3NGHINMVIGFQC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/view.h at line 115 [6.13254]

[4.497]

[5.316]

void get_item_glyph(const item_def *item, unsigned short *glych,
                    unsigned short *glycol);
void get_mons_glyph(const monsters *mons, unsigned short *glych,
                    unsigned short *glycol);

Insertion in crawl-ref/source/view.cc at line 501 [6.16817]

[4.8176]

    }
}
static int get_mons_colour(const monsters *mons)
{
    int col = mons->colour;
    if (mons_friendly(mons))
    {
        col |= COLFLAG_FRIENDLY_MONSTER;
    }
    else if (Options.stab_brand != CHATTR_NORMAL
             && mons_looks_stabbable(mons))
    {
        col |= COLFLAG_WILLSTAB;

Insertion in crawl-ref/source/view.cc at line 517 [6.16817]

[4.8182]

    else if (Options.may_stab_brand != CHATTR_NORMAL
             && mons_looks_distracted(mons))
    {
        col |= COLFLAG_MAYSTAB;
    }
    return (col);

Replacement in crawl-ref/source/view.cc at line 663 [6.16817]

B:BD[5.10534] → [5.10534:10586]

∅:D[5.10586] → [6.46378:46379]

B:BD[6.46378] → [6.46378:46379]

B:BD[6.46630] → [6.46630:46684]

B:BD[6.46684] → [5.10587:10653]

∅:D[5.10653] → [6.46847:46861]

B:BD[6.46847] → [6.46847:46861]

B:BD[6.46861] → [4.9307:9364]

B:BD[4.9364] → [5.10654:10708]

∅:D[5.10708] → [4.9525:9539]

B:BD[4.9525] → [4.9525:9539]

B:BD[4.9539] → [5.10709:10767]

∅:D[5.10767] → [4.9694:9769]

B:BD[4.9694] → [4.9694:9769]

B:BD[4.9769] → [5.10768:10823]

∅:D[5.10823] → [4.9933:9947]

B:BD[4.9933] → [4.9933:9947]

B:BD[4.9947] → [5.10824:10881]

∅:D[5.10881] → [4.10786:10800]

B:BD[4.10786] → [4.10786:10800]

            env.show_col[ex][ey] = monster->colour;
            if (mons_friendly(monster))
            {
                env.show_col[ex][ey] |= COLFLAG_FRIENDLY_MONSTER;
            }
            else if (Options.stab_brand != CHATTR_NORMAL
                    && mons_looks_stabbable(monster))
            {
                env.show_col[ex][ey] |= COLFLAG_WILLSTAB;
            }
            else if (Options.may_stab_brand != CHATTR_NORMAL
                    && mons_looks_distracted(monster))
            {
                env.show_col[ex][ey] |= COLFLAG_MAYSTAB;
            }

[5.10534]

[6.46868]

            env.show_col[ex][ey] = get_mons_colour( monster );

Insertion in crawl-ref/source/view.cc at line 809 [6.16817]

[6.54429]

void get_item_glyph( const item_def *item, unsigned short *glych,
                     unsigned short *glycol )
{
    *glycol = item->colour;
    get_symbol( 0, 0, get_item_dngn_code( *item ), glych, glycol );
}

Insertion in crawl-ref/source/view.cc at line 816 [6.16817]

[6.54430]

void get_mons_glyph( const monsters *mons, unsigned short *glych,
                     unsigned short *glycol )
{
    *glycol = get_mons_colour( mons );
    get_symbol( 0, 0, mons->type + DNGN_START_OF_MONSTERS, glych, glycol );
}

Insertion in crawl-ref/source/message.h at line 101 [6.1990888]
[4.253922]
[6.1993782]
```
int channel_to_colour( int channel, int param = 0 );
```
Replacement in crawl-ref/source/message.cc at line 117 [6.1993826]
B:BD[6.1995820] → [6.1995820:1995876]
```
static char channel_to_colour( int channel, int param )
```
[6.1995820]
[6.1995876]
```
int channel_to_colour( int channel, int param )
```
Replacement in crawl-ref/source/message.cc at line 232 [6.1993826]
B:BD[6.1998930] → [6.1998930:1998986]
```
static char channel_to_colour( int channel, int param )
```
[6.1998930]
[6.1998986]
```
int channel_to_colour( int channel, int param )
```
Replacement in crawl-ref/source/menu.h at line 57 [4.255942]
B:BD[5.558370] → [5.558370:558405]
```
    formatted_string() : ops() { }
```
[5.558370]
[2.1228]
```
    formatted_string(int init_colour = 0);
```

Insertion in crawl-ref/source/menu.h at line 68 [4.255942]

[5.558776]

    void add_glyph(const monsters *mons);
    void add_glyph(const item_def *item);

Deletion in crawl-ref/source/menu.h at line 84 [4.255942]
B:BD[5.559241] → [3.3752:3760]
```
public:
```
Insertion in crawl-ref/source/menu.h at line 85 [4.255942]
[5.559292]
[5.559292]
```
private:
    int find_last_colour() const;
```

Insertion in crawl-ref/source/menu.cc at line 932 [4.261322]

[5.574868]


formatted_string::formatted_string(int init_colour)
    : ops()
{
    if (init_colour)
        textcolor(init_colour);
}

Replacement in crawl-ref/source/menu.cc at line 944 [4.261322]
B:BD[2.1391] → [2.1391:1427]
∅:D[2.1427] → [5.575011:575033]
B:BD[5.575011] → [5.575011:575033]
```
        ops.push_back(init_colour);
    ops.push_back(s);
```
[2.1391]
[5.575033]
```
        textcolor(init_colour);
    cprintf(s);
```

Insertion in crawl-ref/source/menu.cc at line 1124 [4.261322]

[5.579068]

}
int formatted_string::find_last_colour() const
{
    if (!ops.empty())
    {
        for (int i = ops.size() - 1; i >= 0; --i)
        {
            if (ops[i].type == FSOP_COLOUR)
                return (ops[i].x);
        }
    }
    return (LIGHTGREY);

Insertion in crawl-ref/source/menu.cc at line 1139 [4.261322]

[5.579071]

void formatted_string::add_glyph(const item_def *item)
{
    const int last_col = find_last_colour();
    unsigned short ch, col;
    get_item_glyph(item, &ch, &col);
    this->textcolor(col);
    this->cprintf("%c", ch);
    this->textcolor(last_col);
}
void formatted_string::add_glyph(const monsters *mons)
{
    const int last_col = find_last_colour();
    unsigned short ch, col;
    get_mons_glyph(mons, &ch, &col);
    this->textcolor(col);
    this->cprintf("%c", ch);
    this->textcolor(last_col);
}

Insertion in crawl-ref/source/menu.cc at line 1161 [4.261322]

[5.579117]

    if (!ops.empty() && ops[ ops.size() - 1 ].type == FSOP_COLOUR)
        ops.erase( ops.end() - 1 );

Deletion in crawl-ref/source/describe.cc at line 88 [6.3736416]
B:BD[6.3738860] → [6.3738860:3738916]
```
#ifdef DOS
    const unsigned int lineWidth = 52;
#else
```
Deletion in crawl-ref/source/describe.cc at line 89 [6.3736416]
B:BD[6.3738955] → [6.3738955:3738962]
```
#endif
```

Replacement in crawl-ref/source/delay.cc at line 947 [6.3963459]

B:BD[7.2327] → [7.2327:2443]

        mprf(MSGCH_WARN,
             "%s in view: (%d,%d), see_grid: %s",
             ptr_monam(mon, DESC_PLAIN),

[7.2327]

[7.2443]

        formatted_string fs( channel_to_colour(MSGCH_WARN) );
        fs.cprintf("%s (", ptr_monam(mon, DESC_PLAIN));
        fs.add_glyph( mon );
        fs.cprintf(") in view: (%d,%d), see_grid: %s",

Insertion in crawl-ref/source/delay.cc at line 953 [6.3963459]
[7.2526]
[7.2526]
```
        formatted_mpr(fs, MSGCH_WARN);
```

Added add_glyph methods to formatted string to show a monster or item glyph as

Dependencies

In channels

Change contents

Insertion in crawl-ref/source/view.h at line 115 [6.13254]

Insertion in crawl-ref/source/view.cc at line 501 [6.16817]

Insertion in crawl-ref/source/view.cc at line 517 [6.16817]

Replacement in crawl-ref/source/view.cc at line 663 [6.16817]

Insertion in crawl-ref/source/view.cc at line 809 [6.16817]

Insertion in crawl-ref/source/view.cc at line 816 [6.16817]

Insertion in crawl-ref/source/message.h at line 101 [6.1990888]

Replacement in crawl-ref/source/message.cc at line 117 [6.1993826]

Replacement in crawl-ref/source/message.cc at line 232 [6.1993826]

Replacement in crawl-ref/source/menu.h at line 57 [4.255942]

Insertion in crawl-ref/source/menu.h at line 68 [4.255942]

Deletion in crawl-ref/source/menu.h at line 84 [4.255942]

Insertion in crawl-ref/source/menu.h at line 85 [4.255942]

Insertion in crawl-ref/source/menu.cc at line 932 [4.261322]

Replacement in crawl-ref/source/menu.cc at line 944 [4.261322]

Insertion in crawl-ref/source/menu.cc at line 1124 [4.261322]

Insertion in crawl-ref/source/menu.cc at line 1139 [4.261322]

Insertion in crawl-ref/source/menu.cc at line 1161 [4.261322]

Deletion in crawl-ref/source/describe.cc at line 88 [6.3736416]

Deletion in crawl-ref/source/describe.cc at line 89 [6.3736416]

Replacement in crawl-ref/source/delay.cc at line 947 [6.3963459]

Insertion in crawl-ref/source/delay.cc at line 953 [6.3963459]