fiddlerwoaroof/crawl - Change QEX3OFNT4IDUY3FNCPNKXB2RWHXRGEXTQQXB63GMVOTGQQ3IO5TAC

Add miscellaneous cosmetic fixes.

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

Created by dolorous on November 7, 2008

QEX3OFNT4IDUY3FNCPNKXB2RWHXRGEXTQQXB63GMVOTGQQ3IO5TAC

Dependencies

In channels

main

Change contents

Deletion in crawl-ref/source/beam.cc at line 4448 [4.4128068]
∅:D[2.3211] → [4.4241495:4241496]
B:BD[4.4241495] → [4.4241495:4241496]

Replacement in crawl-ref/source/acr.cc at line 2533 [4.4397395]

B:BD[4.4439991] → [4.4439991:4440055]

        mpr( "You are covered in liquid flames!", MSGCH_WARN );

[4.4439991]

[5.1267266]

        mpr("You are covered in liquid flames!", MSGCH_WARN);

Replacement in crawl-ref/source/acr.cc at line 2594 [4.4397395]
B:BD[4.4443032] → [6.4923:4964]
```
    if (you.duration[DUR_DIVINE_SHIELD])
```
[4.4443032]
[6.4964]
```
    if (you.duration[DUR_DIVINE_SHIELD] > 0)
```

Replacement in crawl-ref/source/acr.cc at line 2691 [4.4397395]

B:BD[4.4446461] → [7.23265:23548]

    if ( _decrement_a_duration(DUR_STONEMAIL,
                               "Your scaly stone armour disappears.",
                               6, coinflip(),
                               "Your scaly stone armour is starting "
                               "to flake away.") )

[4.4446461]

[4.4446502]

    if (_decrement_a_duration(DUR_STONEMAIL,
                              "Your scaly stone armour disappears.",
                              6, coinflip(),
                              "Your scaly stone armour is starting "
                              "to flake away."))

Replacement in crawl-ref/source/acr.cc at line 2701 [4.4397395]

B:BD[4.4447349] → [7.23549:23594]

B:BD[7.23594] → [8.3671:3869]

    if ( _decrement_a_duration(DUR_FORESCRY,
                               "You feel firmly rooted in the present.",
                               6, coinflip(),
                               "Your vision of the future begins to falter."))

[4.4447349]

[8.3869]

    if (_decrement_a_duration(DUR_FORESCRY,
                              "You feel firmly rooted in the present.",
                              6, coinflip(),
                              "Your vision of the future begins to falter."))

Replacement in crawl-ref/source/acr.cc at line 2709 [4.4397395]

B:BD[4.4447556] → [7.23670:23745]

    if ( _decrement_a_duration(DUR_SEE_INVISIBLE) && !player_see_invis() )

[4.4447556]

[9.3202]

    if (_decrement_a_duration(DUR_SEE_INVISIBLE) && !player_see_invis())

Replacement in crawl-ref/source/acr.cc at line 2716 [4.4397395]

B:BD[4.4447781] → [7.23881:24001]

    if ( _decrement_a_duration(DUR_CONDENSATION_SHIELD,
                               "Your icy shield evaporates.") )

[4.4447781]

[9.3519]

    if (_decrement_a_duration(DUR_CONDENSATION_SHIELD,
                              "Your icy shield evaporates."))
    {

Insertion in crawl-ref/source/acr.cc at line 2720 [4.4397395]
[9.3559]
[4.4447887]
```
    }
```

Replacement in crawl-ref/source/acr.cc at line 2728 [4.4397395]

B:BD[4.4448324] → [7.24002:24119]

    if ( _decrement_a_duration(DUR_MAGIC_SHIELD,
                               "Your magical shield disappears.") )

[4.4448324]

[9.3853]

    if (_decrement_a_duration(DUR_MAGIC_SHIELD,
                              "Your magical shield disappears."))
    {

Insertion in crawl-ref/source/acr.cc at line 2732 [4.4397395]
[9.3893]
[10.1941]
```
    }
```

Replacement in crawl-ref/source/acr.cc at line 2734 [4.4397395]

B:BD[10.1942] → [7.24120:24195]

    if ( _decrement_a_duration(DUR_STONESKIN, "Your skin feels tender.") )

[10.1942]

[9.3968]

    if (_decrement_a_duration(DUR_STONESKIN, "Your skin feels tender."))
    {

Insertion in crawl-ref/source/acr.cc at line 2737 [4.4397395]
[9.4008]
[4.4448880]
```
    }
```
Replacement in crawl-ref/source/acr.cc at line 2739 [4.4397395]
B:BD[4.4448881] → [7.24196:24243]
```
    if ( _decrement_a_duration(DUR_TELEPORT) )
```
[4.4448881]
[4.4449005]
```
    if (_decrement_a_duration(DUR_TELEPORT))
```
Replacement in crawl-ref/source/acr.cc at line 2787 [4.4397395]
B:BD[4.4451761] → [7.25507:25555]
```
    _decrement_a_duration( DUR_CONFUSING_TOUCH,
```
[4.4451761]
[9.5346]
```
    _decrement_a_duration(DUR_CONFUSING_TOUCH,
```

Replacement in crawl-ref/source/acr.cc at line 2789 [4.4397395]

B:BD[9.5416] → [9.5416:5471]

                          " stop glowing.").c_str() );

[9.5416]

[4.4451937]

                          " stop glowing.").c_str());

Replacement in crawl-ref/source/acr.cc at line 2791 [4.4397395]
B:BD[4.4451938] → [7.25556:25599]
```
    _decrement_a_duration( DUR_SURE_BLADE,
```
[4.4451938]
[9.5514]
```
    _decrement_a_duration(DUR_SURE_BLADE,
```

Replacement in crawl-ref/source/acr.cc at line 2794 [4.4397395]

B:BD[11.10547] → [7.25600:25738]

    if ( _decrement_a_duration( DUR_BEHELD, "You break out of your daze.",
                                -1, 0, NULL, MSGCH_RECOVERY ))

[11.10547]

[11.10683]

    if ( _decrement_a_duration(DUR_BEHELD, "You break out of your daze.",
                               -1, 0, NULL, MSGCH_RECOVERY ))

Replacement in crawl-ref/source/acr.cc at line 2854 [4.4397395]
B:BD[4.4454088] → [4.4454088:4454131]
```
        int dur = 12 + roll_dice( 2, 12 );
```
[4.4454088]
[12.17375]
```
        int dur = 12 + roll_dice(2, 12);
```
Replacement in crawl-ref/source/acr.cc at line 2864 [4.4397395]
B:BD[9.6822] → [9.6822:6854]
```
            slow_player( dur );
```
[9.6822]
[9.6854]
```
            slow_player(dur);
```

Replacement in crawl-ref/source/acr.cc at line 2869 [4.4397395]

B:BD[4.4454223] → [4.4454223:4454281]

        if (you.hunger < 50)
            you.hunger = 50;

[4.4454223]

[4.4454281]

        you.hunger = std::max(50, you.hunger);

Replacement in crawl-ref/source/acr.cc at line 2919 [4.4397395]

∅:D[13.7295] → [7.26150:26228]

B:BD[14.2230] → [7.26150:26228]

        if ( _decrement_a_duration(DUR_CONTROLLED_FLIGHT) && you.airborne() )

[13.7295]

[14.2307]

        if (_decrement_a_duration(DUR_CONTROLLED_FLIGHT) && you.airborne())

Replacement in crawl-ref/source/acr.cc at line 2975 [4.4397395]

B:BD[4.4457843] → [4.4457843:4457904]

                // the poison running through your veins.");

[4.4457843]

[3.9221]

                // "the poison running through your veins.");

Add miscellaneous cosmetic fixes.

Dependencies

In channels

Change contents

Deletion in crawl-ref/source/beam.cc at line 4448 [4.4128068]

Replacement in crawl-ref/source/acr.cc at line 2533 [4.4397395]

Replacement in crawl-ref/source/acr.cc at line 2594 [4.4397395]

Replacement in crawl-ref/source/acr.cc at line 2691 [4.4397395]

Replacement in crawl-ref/source/acr.cc at line 2701 [4.4397395]

Replacement in crawl-ref/source/acr.cc at line 2709 [4.4397395]

Replacement in crawl-ref/source/acr.cc at line 2716 [4.4397395]

Insertion in crawl-ref/source/acr.cc at line 2720 [4.4397395]

Replacement in crawl-ref/source/acr.cc at line 2728 [4.4397395]

Insertion in crawl-ref/source/acr.cc at line 2732 [4.4397395]

Replacement in crawl-ref/source/acr.cc at line 2734 [4.4397395]

Insertion in crawl-ref/source/acr.cc at line 2737 [4.4397395]

Replacement in crawl-ref/source/acr.cc at line 2739 [4.4397395]

Replacement in crawl-ref/source/acr.cc at line 2787 [4.4397395]

Replacement in crawl-ref/source/acr.cc at line 2789 [4.4397395]

Replacement in crawl-ref/source/acr.cc at line 2791 [4.4397395]

Replacement in crawl-ref/source/acr.cc at line 2794 [4.4397395]

Replacement in crawl-ref/source/acr.cc at line 2854 [4.4397395]

Replacement in crawl-ref/source/acr.cc at line 2864 [4.4397395]

Replacement in crawl-ref/source/acr.cc at line 2869 [4.4397395]

Replacement in crawl-ref/source/acr.cc at line 2919 [4.4397395]

Replacement in crawl-ref/source/acr.cc at line 2975 [4.4397395]