fiddlerwoaroof/crawl - Change QD72QU3HMLD7JO2ZD6BAQQNEFKTDOH7BDVMVGL4TD65JGOZ5P7IAC

Fix 2082716: clean colour tags from dumps.

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

Created by haranp on September 15, 2008

QD72QU3HMLD7JO2ZD6BAQQNEFKTDOH7BDVMVGL4TD65JGOZ5P7IAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/message.cc at line 900 [4.1993826]
B:BD[3.2877] → [3.2877:2907]
```
        return std::string();
```
[3.2877]
[5.3849]
```
        return "";
```

Replacement in crawl-ref/source/message.cc at line 905 [4.1993826]

B:BD[6.255277] → [3.2993:3086]

    bool full_buffer
       = (Store_Message[ NUM_STORED_MESSAGES - 1 ].text.length() == 0);

[6.255277]

[6.255361]

    bool full_buffer = (Store_Message[NUM_STORED_MESSAGES - 1].text.empty());

Replacement in crawl-ref/source/message.cc at line 916 [4.1993826]

∅:D[5.3852] → [7.334:403]

B:BD[7.334] → [7.334:403]

        if (msg.text.length() && is_channel_dumpworthy(msg.channel))

[5.3852]

[6.255661]

        if (!msg.text.empty() && is_channel_dumpworthy(msg.channel))

Replacement in crawl-ref/source/message.cc at line 918 [4.1993826]

B:BD[6.255671] → [7.404:434]

            text += msg.text;

[6.255671]

[6.255714]

            text += formatted_string::parse_string(msg.text).tostring();

Replacement in crawl-ref/source/message.cc at line 975 [4.1993826]

B:BD[4.2002236] → [4.2002236:2002305]

    if (Store_Message[ NUM_STORED_MESSAGES - 1 ].text.length() == 0)

[4.2002236]

[4.2002305]

    if (Store_Message[NUM_STORED_MESSAGES - 1].text.empty())

Replacement in crawl-ref/source/message.cc at line 1024 [4.1993826]

B:BD[4.2003625] → [8.7015:7074]

            std::string text = Store_Message[ line ].text;

[4.2003625]

[9.6476]

            std::string text = Store_Message[line].text;

Replacement in crawl-ref/source/dungeon.cc at line 2450 [4.3429798]
B:BD[4.3566076] → [4.3566076:3566087]
B:BD[4.3566087] → [10.6409:6464]
```
    int i;
    int num_traps = num_traps_for_place(level_number);
```
[4.3566076]
[10.6464]
```
    const int num_traps = num_traps_for_place(level_number);
```
Replacement in crawl-ref/source/dungeon.cc at line 2455 [4.3429798]
B:BD[4.3566126] → [4.3566126:3566162]
```
    for (i = 0; i < num_traps; i++)
```
[4.3566126]
[4.3566162]
```
    for (int i = 0; i < num_traps; i++)
```
Replacement in crawl-ref/source/dungeon.cc at line 2457 [4.3429798]
B:BD[4.3566168] → [11.5440:5482]
∅:D[11.5482] → [4.3566209:3566258]
B:BD[4.3566209] → [4.3566209:3566258]
```
        // Traps can be placed in vaults.
        if (env.trap[i].type != TRAP_UNASSIGNED)
```
[4.3566168]
[4.3566258]
```
        trap_struct& ts(env.trap[i]);
        if (ts.type != TRAP_UNASSIGNED)
```

Replacement in crawl-ref/source/dungeon.cc at line 2464 [4.3429798]

B:BD[4.3566302] → [2.74655:74747]

            env.trap[i].pos.x = random2(GXM);
            env.trap[i].pos.y = random2(GYM);

[4.3566302]

[4.3566406]

            ts.pos.x = random2(GXM);
            ts.pos.y = random2(GYM);

Replacement in crawl-ref/source/dungeon.cc at line 2467 [4.3429798]

B:BD[4.3566416] → [2.74748:74798]

        while (grd(env.trap[i].pos) != DNGN_FLOOR

[4.3566416]

[12.23898]

        while (in_bounds(ts.pos)
               && grd(ts.pos) != DNGN_FLOOR

Replacement in crawl-ref/source/dungeon.cc at line 2474 [4.3429798]

∅:D[10.6574] → [13.10468:10517]

B:BD[4.3566482] → [13.10468:10517]

B:BD[13.10517] → [10.6575:6632]

B:BD[10.6632] → [14.13752:13753]

∅:D[14.13753] → [15.9533:9591]

B:BD[15.9533] → [15.9533:9591]

        trap_type &trap_type = env.trap[i].type;
        trap_type = random_trap_for_place(level_number);
        if (trap_type == TRAP_SHAFT && level_number <= 7)

[10.6574]

[15.9591]

        ts.type = random_trap_for_place(level_number);
        if (ts.type == TRAP_SHAFT && level_number <= 7)

Replacement in crawl-ref/source/dungeon.cc at line 2478 [4.3429798]

B:BD[15.9658] → [2.74799:74857]

            if ( _shaft_is_in_corridor(env.trap[i].pos) )

[15.9658]

[15.9729]

            if ( _shaft_is_in_corridor(ts.pos) )

Replacement in crawl-ref/source/dungeon.cc at line 2481 [4.3429798]

∅:D[11.5516] → [15.9776:9841]

B:BD[15.9776] → [15.9776:9841]

                trap_type = random_trap_for_place(level_number);

[11.5516]

[14.13754]

                ts.type = random_trap_for_place(level_number);

Replacement in crawl-ref/source/dungeon.cc at line 2484 [4.3429798]

B:BD[15.9936] → [15.9936:10025]

                if (trap_type == TRAP_SHAFT)
                    trap_type = TRAP_ALARM;

[15.9936]

[15.10025]

                if (ts.type == TRAP_SHAFT)
                    ts.type = TRAP_ALARM;

Replacement in crawl-ref/source/dungeon.cc at line 2488 [4.3429798]
∅:D[10.6632] → [16.963882:963883]
∅:D[15.10049] → [16.963882:963883]
∅:D[17.118507] → [16.963882:963883]
B:BD[16.963882] → [16.963882:963883]
B:BD[16.963883] → [2.74858:74913]
```
        grd(env.trap[i].pos) = DNGN_UNDISCOVERED_TRAP;
```
[15.10049]
[18.13229]
```
        grd(ts.pos) = DNGN_UNDISCOVERED_TRAP;
```