fiddlerwoaroof/crawl - Change 2B4AQJIATJ4E7RFN6OTQITZNDBAPQ2VWWXLBCVYSORAFG2GIIDNQC

Allow "mute" as a colour in message_colour, which means the message

will be muted (duh.) message_colour can now override channel mutings (e.g., if you want to mute the pray channel except for a specific message.) Factored out some common code from {base,formatted}_mpr.

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

Created by haranp on April 4, 2007

2B4AQJIATJ4E7RFN6OTQITZNDBAPQ2VWWXLBCVYSORAFG2GIIDNQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/message.cc at line 313 [3.1993826]

B:BD[2.3838] → [2.3838:3914]

static void mpr_check_patterns(std::string message, int channel, int param)

[2.3838]

[4.557654]

static void mpr_check_patterns(const std::string& message, int channel,
                               int param)

Replacement in crawl-ref/source/message.cc at line 358 [3.1993826]

B:BD[2.4366] → [2.4366:4442]

static void mpr_store_messages(std::string message, int channel, int param)

[2.4366]

[2.4442]

static void mpr_store_messages(const std::string& message,
                               int channel, int param)

Replacement in crawl-ref/source/message.cc at line 379 [3.1993826]

B:BD[5.906] → [2.4447:4509]

        Store_Message[ Next_Message ].text = message.c_str();

[5.906]

[3.2000104]

        Store_Message[ Next_Message ].text = message;

Replacement in crawl-ref/source/message.cc at line 390 [3.1993826]

B:BD[2.4546] → [2.4546:4608]

static void base_mpr(const char *inf, int channel, int param)

[2.4546]

[6.607]


// Does the work common to base_mpr and formatted_mpr.
// Returns the default colour of the message, or MSGCOL_MUTED if
// the message should be suppressed.
static int prepare_message(const std::string& imsg, int channel, int param)

Replacement in crawl-ref/source/message.cc at line 397 [3.1993826]
B:BD[6.636] → [6.636:652]
```
        return;
```
[6.636]
[6.652]
```
        return MSGCOL_MUTED;    
```

Replacement in crawl-ref/source/message.cc at line 400 [3.1993826]

B:BD[6.707] → [6.707:755]

    if (colour == MSGCOL_MUTED)
        return;

[6.707]

[6.755]


    const std::vector<message_colour_mapping>& mcm =
        Options.message_colour_mappings;
    typedef std::vector<message_colour_mapping>::const_iterator mcmci;

Replacement in crawl-ref/source/message.cc at line 405 [3.1993826]

B:BD[6.756] → [2.4609:4637]

∅:D[2.4637] → [6.800:805]

B:BD[6.800] → [6.800:805]

B:BD[6.805] → [2.4638:4739]

    std::string imsg = inf;
    
    mpr_check_patterns(imsg, channel, param);
    
    if (!Options.message_colour_mappings.empty())

[6.756]

[7.78110]

    for ( mcmci ci = mcm.begin(); ci != mcm.end(); ++ci )

Replacement in crawl-ref/source/message.cc at line 407 [3.1993826]

B:BD[7.78116] → [2.4740:4874]

        std::string message = inf;
        for (int i = 0, size = Options.message_colour_mappings.size();
             i < size; ++i)

[7.78116]

[7.78168]

        if (ci->message.is_filtered(channel, imsg))

Replacement in crawl-ref/source/message.cc at line 409 [3.1993826]

B:BD[7.78178] → [2.4875:5030]

∅:D[2.5030] → [6.1820:1834]

B:BD[6.1820] → [6.1820:1834]

B:BD[6.1834] → [2.5031:5066]

∅:D[2.5066] → [6.1907:1944]

B:BD[6.1907] → [6.1907:1944]

            const message_colour_mapping &m =
                Options.message_colour_mappings[i];
            if (m.message.is_filtered(channel, message))
            {
                colour = m.colour;
                break;
            }

[7.78178]

[6.1944]

            colour = ci->colour;
            break;

Replacement in crawl-ref/source/message.cc at line 414 [3.1993826]

B:BD[6.1961] → [6.1961:2005]

    flush_input_buffer( FLUSH_ON_MESSAGE );

[6.1961]

[6.2005]

    if ( colour != MSGCOL_MUTED )
    {
        mpr_check_patterns(imsg, channel, param);
        flush_input_buffer( FLUSH_ON_MESSAGE );
        const int num_lines = get_message_window_height();
    
        if (New_Message_Count == num_lines - 1)
            more();
    }
    return colour;
}

Replacement in crawl-ref/source/message.cc at line 426 [3.1993826]

B:BD[6.2006] → [6.2006:2061]

    const int num_lines = get_message_window_height();

[6.2006]

[6.2061]

static void base_mpr(const char *inf, int channel, int param)
{
    const std::string imsg = inf;
    const int colour = prepare_message( imsg, channel, param );

Replacement in crawl-ref/source/message.cc at line 431 [3.1993826]

B:BD[6.2066] → [6.2066:2131]

    if (New_Message_Count == num_lines - 1)
        more();

[6.2066]

[2.5067]

    if ( colour == MSGCOL_MUTED )
        return;

Replacement in crawl-ref/source/message.cc at line 485 [3.1993826]

B:BD[2.5774] → [2.5774:5872]

    if (suppress_messages)
        return;
    int colour = channel_to_colour( channel, param );

[2.5774]

[2.5872]

    const std::string imsg = fs.tostring();
    const int colour = prepare_message(imsg, channel, param);

Deletion in crawl-ref/source/message.cc at line 489 [3.1993826]
B:BD[2.5920] → [2.5920:5965]
∅:D[2.5965] → [6.3098:3103]
B:BD[6.3098] → [6.3098:3103]
B:BD[6.3103] → [2.5966:6012]
```
    const std::string imsg = fs.tostring();
    
    mpr_check_patterns(imsg, channel, param);
```
Deletion in crawl-ref/source/message.cc at line 490 [3.1993826]
B:BD[6.3166] → [2.6013:6057]
∅:D[6.3212] → [3.2000369:2000370]
∅:D[2.6057] → [3.2000369:2000370]
B:BD[3.2000369] → [3.2000369:2000370]
B:BD[3.2000370] → [2.6058:6183]
```
    flush_input_buffer( FLUSH_ON_MESSAGE );
    const int num_lines = get_message_window_height();
    
    if (New_Message_Count == num_lines - 1)
        more();
    
```
Deletion in crawl-ref/source/message.cc at line 491 [3.1993826]
∅:D[2.6221] → [6.3589:3590]
B:BD[6.3589] → [6.3589:3590]

Replacement in crawl-ref/source/initfile.cc at line 1299 [3.2957258]

B:BD[8.2910] → [8.2910:2956]

    const int col = str_to_colour( cmap[0] );

[8.2910]

[8.2956]

    const int col = (cmap[0]=="mute") ? MSGCOL_MUTED : str_to_colour(cmap[0]);