fiddlerwoaroof/crawl - Change WCK6TM2ZD56WSOK6SMMKBYAYGG4OUCTILLMVVLMB4QO5I5S2IVNAC

Type-safety on mpr() and friends channel argument.

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

Created by haranp on August 4, 2007

WCK6TM2ZD56WSOK6SMMKBYAYGG4OUCTILLMVVLMB4QO5I5S2IVNAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/monstuff.h at line 95 [6.1390580]

B:BD[5.146] → [3.328:398]

                            int channel = MSGCH_PLAIN, int param = 0,

[5.146]

[3.398]

                            msg_channel_type channel = MSGCH_PLAIN,
                            int param = 0,

Replacement in crawl-ref/source/monstuff.cc at line 1882 [6.1396662]

B:BD[5.220] → [3.476:528]

                            int channel, int param,

[5.220]

[3.528]

                            msg_channel_type channel, int param,

Replacement in crawl-ref/source/message.h at line 24 [6.1990888]

B:BD[6.1991320] → [6.1991320:1991379]

    int                 channel;        // message channel

[6.1991320]

[6.1991379]

    msg_channel_type    channel;        // message channel

Replacement in crawl-ref/source/message.h at line 58 [6.1990888]

B:BD[6.1992968] → [6.1992968:1993037]

void mpr(const char *inf, int channel = MSGCH_PLAIN, int param = 0);

[6.1992968]

[7.89]

void mpr(const char *inf, msg_channel_type channel = MSGCH_PLAIN, int param=0);

Replacement in crawl-ref/source/message.h at line 62 [6.1990888]

B:BD[6.1993038] → [7.115:224]

void formatted_mpr(const formatted_string& fs, int channel = MSGCH_PLAIN,
                   int param = 0);

[6.1993038]

[8.3535]

void formatted_mpr(const formatted_string& fs,
                   msg_channel_type channel = MSGCH_PLAIN, int param = 0);

Replacement in crawl-ref/source/message.h at line 66 [6.1990888]

∅:D[9.1075] → [8.3608:3682]

B:BD[8.3608] → [8.3608:3682]

                               int channel = MSGCH_PLAIN, int param = 0);

[9.1075]

[8.3682]

                               msg_channel_type channel = MSGCH_PLAIN,
                               int param = 0);

Replacement in crawl-ref/source/message.h at line 70 [6.1990888]

B:BD[10.554938] → [11.465:527]

∅:D[11.527] → [10.554938:554989]

B:BD[10.554938] → [10.554938:554989]

void mprf( int channel, int param, const char *format, ... );
void mprf( int channel, const char *format, ... );

[10.554938]

[10.554989]

void mprf( msg_channel_type channel, int param, const char *format, ... );
void mprf( msg_channel_type channel, const char *format, ... );

Replacement in crawl-ref/source/message.h at line 95 [6.1990888]

B:BD[12.1288] → [12.1288:1341]

int channel_to_colour( int channel, int param = 0 );

[12.1288]

[13.231]

int channel_to_colour( msg_channel_type channel, int param = 0 );

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

B:BD[10.555269] → [10.555269:555332]

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

[10.555269]

[13.1073]

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

Replacement in crawl-ref/source/message.cc at line 148 [6.1993826]
∅:D[10.555498] → [6.1994697:1994746]
B:BD[6.1994697] → [6.1994697:1994746]
```
static char god_message_altar_colour( char god )
```
[10.555498]
[6.1994746]
```
static char god_message_altar_colour( god_type god )
```
Insertion in crawl-ref/source/message.cc at line 199 [6.1993826]
[6.1995689]
[6.1995689]
```
    case GOD_LUGONU:
        return (LIGHTRED);
```
Replacement in crawl-ref/source/message.cc at line 203 [6.1993826]
B:BD[6.1995710] → [6.1995710:1995747]
```
    default:
        return(YELLOW);
```
[6.1995710]
[6.1995747]
```
    case NUM_GODS:
    case GOD_RANDOM:
        return (YELLOW);
```
Insertion in crawl-ref/source/message.cc at line 207 [6.1993826]
[6.1995753]
[6.1995753]
```
    return (YELLOW);            // for stupid compilers
```
Replacement in crawl-ref/source/message.cc at line 213 [6.1993826]
B:BD[6.1995820] → [12.1343:1391]
```
int channel_to_colour( int channel, int param )
```
[6.1995820]
[6.1995876]
```
int channel_to_colour( msg_channel_type channel, int param )
```
Replacement in crawl-ref/source/message.cc at line 215 [6.1993826]
B:BD[6.1995878] → [6.1995878:1995899]
```
    char        ret;
```
[6.1995878]
[6.1995899]
```
    char ret;
```

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

B:BD[14.45147] → [14.45147:45200]

                : god_message_altar_colour( param );

[14.45147]

[6.1996696]

                : god_message_altar_colour( static_cast<god_type>(param) );

Replacement in crawl-ref/source/message.cc at line 336 [6.1993826]
B:BD[6.1998930] → [12.1392:1440]
```
int channel_to_colour( int channel, int param )
```
[6.1998930]
[6.1998986]
```
int channel_to_colour( msg_channel_type channel, int param )
```
Replacement in crawl-ref/source/message.cc at line 343 [6.1993826]
B:BD[6.1999023] → [10.555731:555786]
```
static void do_message_print( int channel, int param, 
```
[6.1999023]
[10.555786]
```
static void do_message_print( msg_channel_type channel, int param, 
```

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

B:BD[11.530] → [11.530:591]

void mprf( int channel, int param, const char *format, ... )

[11.530]

[11.591]

void mprf( msg_channel_type channel, int param, const char *format, ... )

Replacement in crawl-ref/source/message.cc at line 361 [6.1993826]
B:BD[10.555981] → [10.555981:556031]
```
void mprf( int channel, const char *format, ... )
```
[10.555981]
[10.556031]
```
void mprf( msg_channel_type channel, const char *format, ... )
```
Replacement in crawl-ref/source/message.cc at line 378 [6.1993826]
∅:D[10.556320] → [6.1999023:1999073]
B:BD[6.1999023] → [6.1999023:1999073]
```
void mpr(const char *inf, int channel, int param)
```
[10.556320]
[6.1999073]
```
void mpr(const char *inf, msg_channel_type channel, int param)
```

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

B:BD[8.3838] → [15.94:166]

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

[8.3838]

[15.166]

static void mpr_check_patterns(const std::string& message,
                               msg_channel_type channel,

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

B:BD[15.268] → [15.268:323]

                               int channel, int param)

[15.268]

[8.4442]

                               msg_channel_type channel, int param)

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

B:BD[15.537] → [15.537:613]

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

[15.537]

[7.607]

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

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

B:BD[7.2006] → [15.1278:1340]

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

[7.2006]

[15.1340]

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

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

B:BD[8.5614] → [8.5614:5772]

// XXX This code just reproduces base_mpr(). There must be a better
// way to do this.
void formatted_mpr(const formatted_string& fs, int channel, int param)

[8.5614]

[8.5772]

void formatted_mpr(const formatted_string& fs, msg_channel_type channel,
                   int param)

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

B:BD[8.6421] → [9.1134:1212]

void formatted_message_history(const std::string &st, int channel, int param)

[8.6421]

[8.6498]

void formatted_message_history(const std::string &st, msg_channel_type channel,
                               int param)

Replacement in crawl-ref/source/message.cc at line 688 [6.1993826]
B:BD[16.255121] → [2.94:141]
```
static bool is_channel_dumpworthy(int channel)
```
[16.255121]
[2.141]
```
static bool is_channel_dumpworthy(msg_channel_type channel)
```

Replacement in crawl-ref/source/menu.h at line 407 [16.255942]

B:BD[17.51057] → [17.51057:51135]

void print_formatted_paragraph( std::string &s, int maxcol, int channel = 0);

[17.51057]

[4.330]

void print_formatted_paragraph( std::string &s, int maxcol,
                                msg_channel_type channel = MSGCH_PLAIN);

Replacement in crawl-ref/source/menu.cc at line 1271 [16.261322]

B:BD[17.52632] → [17.52632:52705]

void print_formatted_paragraph(std::string &s, int maxcol, int channel)

[17.52632]

[17.52705]

void print_formatted_paragraph(std::string &s, int maxcol,
                               msg_channel_type channel)

Replacement in crawl-ref/source/clua.cc at line 1628 [16.483969]
B:BD[16.520814] → [16.520814:520836]
```
    mpr(message, ch);
```
[16.520814]
[16.520837]
```
    mpr(message, static_cast<msg_channel_type>(ch));
```
Replacement in crawl-ref/source/beam.cc at line 109 [6.4128068]
∅:D[18.2797] → [19.329:383]
B:BD[19.329] → [19.329:383]
```
static void beam_mpr(int channel, const char *s, ...)
```
[18.2797]
[19.383]
```
static void beam_mpr(msg_channel_type channel, const char *s, ...)
```

Type-safety on mpr() and friends channel argument.

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/monstuff.h at line 95 [6.1390580]

Replacement in crawl-ref/source/monstuff.cc at line 1882 [6.1396662]

Replacement in crawl-ref/source/message.h at line 24 [6.1990888]

Replacement in crawl-ref/source/message.h at line 58 [6.1990888]

Replacement in crawl-ref/source/message.h at line 62 [6.1990888]

Replacement in crawl-ref/source/message.h at line 66 [6.1990888]

Replacement in crawl-ref/source/message.h at line 70 [6.1990888]

Replacement in crawl-ref/source/message.h at line 95 [6.1990888]

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

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

Insertion in crawl-ref/source/message.cc at line 199 [6.1993826]

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

Insertion in crawl-ref/source/message.cc at line 207 [6.1993826]

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

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

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

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

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

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

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

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