fiddlerwoaroof/crawl - Change K3H55AZXRQJZMDDIWZ5YDR3F5T7M7SZFPUANSWHDSJ2TLAWWEDZAC

If a multi-line message matches message_colour or note_messages then apply them

to the whole message before it gets split into lines, rather than to each individual line after it gets split. Breaks previous-messages savefile compatability.

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

Created by zelgadis on December 26, 2008

K3H55AZXRQJZMDDIWZ5YDR3F5T7M7SZFPUANSWHDSJ2TLAWWEDZAC

Dependencies

In channels

main

Change contents

Deletion in crawl-ref/source/message.h at line 18 [7.1990888]
∅:D[6.72401] → [7.1991297:1991298]
B:BD[7.1991297] → [7.1991297:1991298]
B:BD[7.1991298] → [2.2589:2618]
∅:D[2.2618] → [8.386:445]
B:BD[7.1991320] → [8.386:445]
∅:D[8.445] → [7.1991379:1991518]
B:BD[7.1991379] → [7.1991379:1991518]
B:BD[7.1991518] → [2.2619:2652]
```
class message_item {
public:
    msg_channel_type    channel;        // message channel
    int                 param;          // param for channel (god, enchantment)
    std::string         text;           // text of message
    int                 repeats;
```
Deletion in crawl-ref/source/message.h at line 19 [7.1990888]
B:BD[2.2653] → [2.2653:2777]
∅:D[2.2777] → [7.1991518:1991523]
B:BD[7.1991518] → [7.1991518:1991523]
```
    message_item() : channel(NUM_MESSAGE_CHANNELS), param(0), text(""),
                     repeats(0)
        {
        }
};
```

Insertion in crawl-ref/source/message.cc at line 40 [7.1993826]

[9.17548]

[7.1994422]


class message_item {
public:
    msg_channel_type    channel;        // message channel
    int                 param;          // param for channel (god, enchantment)
    unsigned char       colour;
    std::string         text;           // text of message
    int                 repeats;

Insertion in crawl-ref/source/message.cc at line 49 [7.1993826]

[7.1994423]

[10.3908]

    message_item() : channel(NUM_MESSAGE_CHANNELS), param(0), colour(BLACK),
                     text(""), repeats(0)
        {
        }
};

Replacement in crawl-ref/source/message.cc at line 63 [7.1993826]

B:BD[11.555269] → [8.977:1053]

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

[11.555269]

[12.1073]

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

Insertion in crawl-ref/source/message.cc at line 440 [7.1993826]
[10.4747]
[11.556321]
```
    unsigned char colour = prepare_message(help, channel, param);
```
Replacement in crawl-ref/source/message.cc at line 482 [7.1993826]
B:BD[10.5001] → [13.3389:3429]
```
        base_mpr(mbuf, channel, param);
```
[10.5001]
[11.557583]
```
        base_mpr(mbuf, channel, param, colour);
```

Replacement in crawl-ref/source/message.cc at line 600 [7.1993826]

B:BD[14.268] → [8.1886:1954]

                               msg_channel_type channel, int param)

[14.268]

[15.4442]

                               msg_channel_type channel, int param,
                               unsigned char colour)

Replacement in crawl-ref/source/message.cc at line 617 [7.1993826]

B:BD[2.3138] → [2.3138:3214]

            && prev_message.param == param && prev_message.text == message)

[2.3138]

[2.3214]

            && prev_message.param == param && prev_message.text == message
            && prev_message.colour == colour)

Insertion in crawl-ref/source/message.cc at line 642 [7.1993826]
[10.5318]
[7.2000104]
```
        Store_Message[ Next_Message ].colour  = colour;
```

Replacement in crawl-ref/source/message.cc at line 658 [7.1993826]

B:BD[14.537] → [8.1955:2071]

static int prepare_message(const std::string& imsg, msg_channel_type channel,
                           int param)

[14.537]

[16.607]

static unsigned char prepare_message(const std::string& imsg,
                                     msg_channel_type channel,
                                     int param)

Replacement in crawl-ref/source/message.cc at line 665 [7.1993826]

B:BD[16.653] → [16.653:707]

    int colour = channel_to_colour( channel, param );

[16.653]

[14.648]

    if (silenced(you.pos())
        && (channel == MSGCH_SOUND || channel == MSGCH_TALK))
    {
        return MSGCOL_MUTED;
    }
    unsigned char colour = (unsigned char) channel_to_colour( channel, param );

Deletion in crawl-ref/source/message.cc at line 687 [7.1993826]
∅:D[17.3193] → [14.1014:1020]
B:BD[14.1014] → [14.1014:1020]
```
    {
```

Insertion in crawl-ref/source/message.cc at line 688 [7.1993826]

[14.1070]


    return colour;
}
static void handle_more(int colour)
{
    if (colour != MSGCOL_MUTED)
    {

Deletion in crawl-ref/source/message.cc at line 702 [7.1993826]
B:BD[14.1256] → [13.3430:3431]
∅:D[13.3431] → [14.1256:1275]
B:BD[14.1256] → [14.1256:1275]
```
    return colour;
```

Replacement in crawl-ref/source/message.cc at line 704 [7.1993826]

B:BD[16.2006] → [8.2072:2147]

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

[16.2006]

[14.1340]

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

Deletion in crawl-ref/source/message.cc at line 708 [7.1993826]
B:BD[14.1376] → [14.1376:1440]
```
    const int colour = prepare_message( imsg, channel, param );
```
Replacement in crawl-ref/source/message.cc at line 712 [7.1993826]
B:BD[18.408] → [3.7235:7263]
∅:D[3.7263] → [10.5447:5509]
B:BD[10.5447] → [10.5447:5509]
∅:D[10.5509] → [18.509:515]
B:BD[18.509] → [18.509:515]
∅:D[18.515] → [14.1475:1491]
B:BD[14.1475] → [14.1475:1491]
B:BD[14.1491] → [18.516:522]
```
    if (silenced(you.pos())
        && (channel == MSGCH_SOUND || channel == MSGCH_TALK))
    {
        return;
    }
```
[18.408]
[19.3843]
```
    handle_more(colour);
```
Replacement in crawl-ref/source/message.cc at line 737 [7.1993826]
B:BD[15.5290] → [15.5290:5336]
```
    mpr_store_messages(imsg, channel, param);
```
[15.5290]
[5.2678]
```
    mpr_store_messages(imsg, channel, param, colour);
```
Insertion in crawl-ref/source/message.cc at line 791 [7.1993826]
[16.3166]
[15.6183]
```
    handle_more(colour);
```
Replacement in crawl-ref/source/message.cc at line 794 [7.1993826]
B:BD[16.3590] → [15.6222:6268]
```
    mpr_store_messages(imsg, channel, param);
```
[15.6221]
[5.2762]
```
    mpr_store_messages(imsg, channel, param, colour);
```

Replacement in crawl-ref/source/message.cc at line 864 [7.1993826]

B:BD[10.6226] → [10.6226:6293]

        mpr_store_messages(fs.to_colour_string(), channel, param);

[10.6226]

[9.18932]

        mpr_store_messages(fs.to_colour_string(), channel, param, colour);

Insertion in crawl-ref/source/message.cc at line 1001 [7.1993826]
[4.3722]
[4.3722]
```
         marshallByte( outf, Store_Message[i].colour );
```

Replacement in crawl-ref/source/message.cc at line 1016 [7.1993826]

B:BD[4.4065] → [4.4065:4181]

        int param                = unmarshallLong( inf );
        int repeats              = unmarshallLong( inf );

[4.4065]

[4.4181]

        int           param      = unmarshallLong( inf );
        unsigned char colour     = unmarshallByte( inf);
        int           repeats    = unmarshallLong( inf );

Replacement in crawl-ref/source/message.cc at line 1021 [7.1993826]

B:BD[4.4224] → [4.4224:4279]

             mpr_store_messages(text, channel, param);

[4.4224]

[4.4279]

             mpr_store_messages(text, channel, param, colour);

Replacement in crawl-ref/source/message.cc at line 1077 [7.1993826]

B:BD[7.2003374] → [20.3461:3677]

∅:D[20.3677] → [7.2003524:2003590]

B:BD[7.2003524] → [7.2003524:2003590]

            int colour = prepare_message( Store_Message[ line ].text,
                                          Store_Message[ line ].channel,
                                          Store_Message[ line ].param );
            if (colour == MSGCOL_MUTED)
                continue;

[7.2003374]

[7.2003590]

            unsigned char colour = Store_Message[ line ].colour;
            ASSERT(colour != MSGCOL_MUTED);

Replacement in crawl-ref/source/message.cc at line 1080 [7.1993826]
B:BD[7.2003591] → [7.2003591:2003624]
```
            textcolor( colour );
```
[7.2003591]
[7.2003624]
```
            textcolor( Store_Message[ line ].colour );
```

If a multi-line message matches message_colour or note_messages then apply them

Dependencies

In channels

Change contents

Deletion in crawl-ref/source/message.h at line 18 [7.1990888]

Deletion in crawl-ref/source/message.h at line 19 [7.1990888]

Insertion in crawl-ref/source/message.cc at line 40 [7.1993826]

Insertion in crawl-ref/source/message.cc at line 49 [7.1993826]

Replacement in crawl-ref/source/message.cc at line 63 [7.1993826]

Insertion in crawl-ref/source/message.cc at line 440 [7.1993826]

Replacement in crawl-ref/source/message.cc at line 482 [7.1993826]

Replacement in crawl-ref/source/message.cc at line 600 [7.1993826]

Replacement in crawl-ref/source/message.cc at line 617 [7.1993826]

Insertion in crawl-ref/source/message.cc at line 642 [7.1993826]

Replacement in crawl-ref/source/message.cc at line 658 [7.1993826]

Replacement in crawl-ref/source/message.cc at line 665 [7.1993826]

Deletion in crawl-ref/source/message.cc at line 687 [7.1993826]

Insertion in crawl-ref/source/message.cc at line 688 [7.1993826]

Deletion in crawl-ref/source/message.cc at line 702 [7.1993826]

Replacement in crawl-ref/source/message.cc at line 704 [7.1993826]

Deletion in crawl-ref/source/message.cc at line 708 [7.1993826]

Replacement in crawl-ref/source/message.cc at line 712 [7.1993826]

Replacement in crawl-ref/source/message.cc at line 737 [7.1993826]

Insertion in crawl-ref/source/message.cc at line 791 [7.1993826]

Replacement in crawl-ref/source/message.cc at line 794 [7.1993826]

Replacement in crawl-ref/source/message.cc at line 864 [7.1993826]

Insertion in crawl-ref/source/message.cc at line 1001 [7.1993826]

Replacement in crawl-ref/source/message.cc at line 1016 [7.1993826]

Replacement in crawl-ref/source/message.cc at line 1021 [7.1993826]

Replacement in crawl-ref/source/message.cc at line 1077 [7.1993826]

Replacement in crawl-ref/source/message.cc at line 1080 [7.1993826]