fiddlerwoaroof/crawl - Change GBUB77EAYHOFY6GQ5IY3ZSBC7FSQFZZKYNBD5QMCQFIKFLYLWHOQC

Fixed Abyss banishment crash.

Don't show -more- after the "cast into the Abyss" so that players on public servers are not tempted to kill the tty to escape the banishment. It's still possible that there are enough messages in view that the game puts in a -more- unasked for, but I'll live with that.

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

Created by dshaligram on January 2, 2007

GBUB77EAYHOFY6GQ5IY3ZSBC7FSQFZZKYNBD5QMCQFIKFLYLWHOQC

Dependencies

In channels

main

Change contents

Deletion in crawl-ref/source/spl-cast.cc at line 1976 [5.293070]
B:BD[4.188599] → [4.188599:188615]
```
        more();
```
Deletion in crawl-ref/source/spells3.cc at line 1086 [5.531613]
B:BD[5.562093] → [5.562093:562155]
```
        grd[you.x_pos][you.y_pos] = DNGN_STONE_STAIRS_DOWN_I;
```

Replacement in crawl-ref/source/spells3.cc at line 1087 [5.531613]

B:BD[5.562156] → [4.191455:191501]

        down_stairs( true, old_level, true );

[5.562156]

[5.562196]

        down_stairs( true, old_level, DNGN_STONE_STAIRS_DOWN_I );

Insertion in crawl-ref/source/player.cc at line 4394 [5.962854]
[6.355059]
[6.355059]
```
    banished = false;
```

Insertion in crawl-ref/source/monstuff.cc at line 3918 [5.1396662]

[6.439380]

[5.1519072]


        // If the player got banished, discard pending monster actions.
        if (you.banished)
            break;

Replacement in crawl-ref/source/misc.h at line 46 [5.1928926]

B:BD[5.1930404] → [4.248346:248419]

void down_stairs(bool remove_stairs, int old_level, bool force = false);

[5.1930404]

[5.1930457]

void down_stairs(bool remove_stairs, int old_level, int force_stair = 0);

Replacement in crawl-ref/source/misc.cc at line 732 [5.1933596]

B:BD[5.1948192] → [4.251745:251811]

void down_stairs( bool remove_stairs, int old_level, bool force )

[5.1948192]

[5.1948246]

void down_stairs( bool remove_stairs, int old_level, int force_stair )

Replacement in crawl-ref/source/misc.cc at line 737 [5.1933596]

B:BD[5.1948335] → [5.1948335:1948399]

    const unsigned char stair_find = grd[you.x_pos][you.y_pos];

[5.1948335]

[5.1948399]

    const int stair_find =
        force_stair? force_stair : grd[you.x_pos][you.y_pos];

Deletion in crawl-ref/source/misc.cc at line 740 [5.1933596]
B:BD[5.1948400] → [5.1948400:1948438]
```
    //int old_level = you.your_level;
```
Replacement in crawl-ref/source/misc.cc at line 780 [5.1933596]
B:BD[5.1949692] → [4.251812:251854]
```
    if (!force && player_is_levitating() 
```
[5.1949692]
[4.251854]
```
    if (!force_stair && player_is_levitating() 
```
Replacement in crawl-ref/source/misc.cc at line 844 [5.1933596]
B:BD[5.1951006] → [5.1951006:1951030]
```
    mpr("Entering...");
```
[5.1951006]
[5.1951030]
```
    if (!force_stair)
        mpr("Entering...");
```
Replacement in crawl-ref/source/misc.cc at line 858 [5.1933596]
B:BD[4.252416] → [4.252416:252442]
```
        if (!you.running)
```
[4.252416]
[4.252442]
```
        if (!you.running && !force_stair)
```
Replacement in crawl-ref/source/misc.cc at line 906 [5.1933596]
∅:D[6.545669] → [5.1955805:1955861]
B:BD[5.1955805] → [5.1955805:1955861]
```
        mpr( info, MSGCH_DIAGNOSTICS );
        more();
```
[6.545669]
[5.1955861]
```
    mpr( info, MSGCH_DIAGNOSTICS );
```

Replacement in crawl-ref/source/misc.cc at line 953 [5.1933596]

B:BD[5.1957178] → [5.1957178:1957215]

        mpr("You enter the Abyss!");

[5.1957178]

[5.1957215]

        if (!force_stair)
            mpr("You enter the Abyss!");

Deletion in crawl-ref/source/fight.cc at line 3005 [5.3140790]
B:BD[5.3231384] → [5.3231384:3231435]
```
                //if ( !one_chance_in(3) ) break;
```

Replacement in crawl-ref/source/fight.cc at line 3039 [5.3140790]

B:BD[5.3232345] → [5.3232345:3232393]

                    banished(DNGN_ENTER_ABYSS);

[5.3232345]

[5.3232393]

                    you.banished = true;

Insertion in crawl-ref/source/externs.h at line 376 [5.3270163]

[5.3275566]

  bool banished;     // flag signaling that the player is due a visit to the
                     // Abyss.

Replacement in crawl-ref/source/effects.h at line 25 [5.3378996]
B:BD[5.3379521] → [5.3379521:3379561]
```
void banished(unsigned char gate_type);
```
[5.3379521]
[5.3379561]
```
void banished(int gate_type);
```
Replacement in crawl-ref/source/effects.cc at line 131 [5.3382105]
B:BD[5.3384106] → [5.3384106:3384145]
```
void banished(unsigned char gate_type)
```
[5.3384106]
[5.3384145]
```
void banished(int gate_type)
```

Replacement in crawl-ref/source/effects.cc at line 133 [5.3382105]

B:BD[5.3384147] → [5.3384147:3384290]

B:BD[5.3384290] → [3.341:383]

    you_teleport2( false );
    // this is to ensure that you're standing on a suitable space (67)
    grd[you.x_pos][you.y_pos] = gate_type;
    if ( gate_type == DNGN_ENTER_ABYSS )

[5.3384147]

[3.383]

    if (gate_type == DNGN_ENTER_ABYSS)
    {

Insertion in crawl-ref/source/effects.cc at line 136 [5.3382105]
[3.459]
[5.3384290]
```
    }
```

Replacement in crawl-ref/source/effects.cc at line 138 [5.3382105]

B:BD[5.3384291] → [4.449649:449706]

    down_stairs(true, you.your_level, true);  // heh heh

[5.3384291]

[5.3384342]

    down_stairs(true, you.your_level, gate_type);  // heh heh

Insertion in crawl-ref/source/decks.cc at line 522 [5.3987460]
[5.4000080]
[5.4000080]
```
        {
            mpr("You are cast into the Abyss!");
```
Insertion in crawl-ref/source/decks.cc at line 525 [5.3987460]
[5.4000120]
[5.4000120]
```
        }
```

Replacement in crawl-ref/source/beam.cc at line 3188 [5.4128068]

B:BD[5.4229015] → [5.4229015:4229124]

            mpr("You are cast into the Abyss!");
            more();
            banished(DNGN_ENTER_ABYSS);

[5.4229015]

[6.1244519]

            you.banished = true;

Replacement in crawl-ref/source/acr.cc at line 498 [5.4397395]

B:BD[5.4411804] → [5.4411804:4411861]

B:BD[5.4411861] → [4.549464:549517]

            grd[you.x_pos][you.y_pos] = DNGN_EXIT_ABYSS;
            down_stairs(true, you.your_level, true);

[5.4411804]

[5.4411908]

            down_stairs(true, you.your_level, DNGN_EXIT_ABYSS);

Insertion in crawl-ref/source/acr.cc at line 2067 [5.4397395]

[6.1269837]


static void check_banished()
{
    if (you.banished)
    {
        you.banished = false;

Insertion in crawl-ref/source/acr.cc at line 2074 [5.4397395]

[6.1269838]

        if (you.level_type != LEVEL_ABYSS)
        {
            mpr("You are cast into the Abyss!");
            banished(DNGN_ENTER_ABYSS);
        }
    }
}

Insertion in crawl-ref/source/acr.cc at line 2098 [5.4397395]
[2.1003]
[6.1270203]
```
    check_banished();
```
Insertion in crawl-ref/source/acr.cc at line 2179 [5.4397395]
[5.4460351]
[5.4460351]
```
    check_banished();
```

Fixed Abyss banishment crash.

Dependencies

In channels

Change contents

Deletion in crawl-ref/source/spl-cast.cc at line 1976 [5.293070]

Deletion in crawl-ref/source/spells3.cc at line 1086 [5.531613]

Replacement in crawl-ref/source/spells3.cc at line 1087 [5.531613]

Insertion in crawl-ref/source/player.cc at line 4394 [5.962854]

Insertion in crawl-ref/source/monstuff.cc at line 3918 [5.1396662]

Replacement in crawl-ref/source/misc.h at line 46 [5.1928926]

Replacement in crawl-ref/source/misc.cc at line 732 [5.1933596]

Replacement in crawl-ref/source/misc.cc at line 737 [5.1933596]

Deletion in crawl-ref/source/misc.cc at line 740 [5.1933596]

Replacement in crawl-ref/source/misc.cc at line 780 [5.1933596]

Replacement in crawl-ref/source/misc.cc at line 844 [5.1933596]

Replacement in crawl-ref/source/misc.cc at line 858 [5.1933596]

Replacement in crawl-ref/source/misc.cc at line 906 [5.1933596]

Replacement in crawl-ref/source/misc.cc at line 953 [5.1933596]

Deletion in crawl-ref/source/fight.cc at line 3005 [5.3140790]

Replacement in crawl-ref/source/fight.cc at line 3039 [5.3140790]

Insertion in crawl-ref/source/externs.h at line 376 [5.3270163]

Replacement in crawl-ref/source/effects.h at line 25 [5.3378996]

Replacement in crawl-ref/source/effects.cc at line 131 [5.3382105]

Replacement in crawl-ref/source/effects.cc at line 133 [5.3382105]

Insertion in crawl-ref/source/effects.cc at line 136 [5.3382105]

Replacement in crawl-ref/source/effects.cc at line 138 [5.3382105]

Insertion in crawl-ref/source/decks.cc at line 522 [5.3987460]

Insertion in crawl-ref/source/decks.cc at line 525 [5.3987460]

Replacement in crawl-ref/source/beam.cc at line 3188 [5.4128068]

Replacement in crawl-ref/source/acr.cc at line 498 [5.4397395]

Insertion in crawl-ref/source/acr.cc at line 2067 [5.4397395]

Insertion in crawl-ref/source/acr.cc at line 2074 [5.4397395]

Insertion in crawl-ref/source/acr.cc at line 2098 [5.4397395]

Insertion in crawl-ref/source/acr.cc at line 2179 [5.4397395]