fiddlerwoaroof/crawl - Change U5SDF665RTV32CTKTC4QO3Q5B44IAE42MZYJSYUNZP3JZEUTO4KQC

Add miscellaneous minor fixes.

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

Created by dolorous on October 2, 2008

U5SDF665RTV32CTKTC4QO3Q5B44IAE42MZYJSYUNZP3JZEUTO4KQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/spl-cast.cc at line 1320 [4.293070]

B:BD[4.323460] → [5.6344:6401]

        holy_word(50, HOLY_WORD_SPELL, you.pos(), true);

[4.323460]

[4.323483]

        holy_word(100, HOLY_WORD_SPELL, you.pos(), true);

Replacement in crawl-ref/source/spl-cast.cc at line 1324 [4.293070]
B:BD[6.4233] → [6.4233:4258]
```
        turn_undead(50);
```
[6.4233]
[4.323980]
```
        turn_undead(100);
```
Replacement in crawl-ref/source/player.cc at line 3786 [4.962854]
B:BD[4.1031635] → [4.1031635:1031678]
```
        mpr( "You are short of breath." );
```
[4.1031635]
[4.1031678]
```
        mpr("You are short of breath.");
```

Replacement in crawl-ref/source/player.cc at line 3789 [4.962854]

B:BD[4.1031719] → [4.1031719:1031786]

        mpr( "You have a holy aura protecting you from undead." );

[4.1031719]

[4.1031786]

        mpr("You have a holy aura protecting you from undead.");

Replacement in crawl-ref/source/player.cc at line 3792 [4.962854]
B:BD[4.1031828] → [4.1031828:1031880]
```
        mpr( "You are covered in liquid flames." );
```
[4.1031828]
[4.1031880]
```
        mpr("You are covered in liquid flames.");
```
Replacement in crawl-ref/source/player.cc at line 3795 [4.962854]
B:BD[4.1031919] → [4.1031919:1031973]
```
        mpr( "You are protected by an icy shield." );
```
[4.1031919]
[4.1031973]
```
        mpr("You are protected by an icy shield.");
```
Replacement in crawl-ref/source/player.cc at line 3798 [4.962854]
B:BD[4.1032016] → [4.1032016:1032067]
```
        mpr( "You are protected from missiles." );
```
[4.1032016]
[4.1032067]
```
        mpr("You are protected from missiles.");
```
Replacement in crawl-ref/source/player.cc at line 3801 [4.962854]
B:BD[4.1032112] → [4.1032112:1032152]
```
        mpr( "You deflect missiles." );
```
[4.1032112]
[4.1032152]
```
        mpr("You deflect missiles.");
```
Replacement in crawl-ref/source/player.cc at line 3804 [4.962854]
B:BD[4.1032187] → [4.1032187:1032222]
```
        mpr( "You are praying." );
```
[4.1032187]
[4.1032222]
```
        mpr("You are praying.");
```
Replacement in crawl-ref/source/player.cc at line 3822 [4.962854]
B:BD[4.1032341] → [4.1032341:1032381]
```
        mpr( "You can move swiftly." );
```
[4.1032341]
[4.1032381]
```
        mpr("You can move swiftly.");
```
Replacement in crawl-ref/source/player.cc at line 3825 [4.962854]
B:BD[4.1032420] → [4.1032420:1032457]
```
        mpr( "You are insulated." );
```
[4.1032420]
[4.1032457]
```
        mpr("You are insulated.");
```
Replacement in crawl-ref/source/player.cc at line 3828 [4.962854]
B:BD[4.1032495] → [4.1032495:1032549]
```
        mpr( "You are covered in scales of stone." );
```
[4.1032495]
[4.1032549]
```
        mpr("You are covered in scales of stone.");
```
Replacement in crawl-ref/source/player.cc at line 3831 [4.962854]
B:BD[4.1032595] → [4.1032595:1032642]
```
        mpr( "You can control your flight." );
```
[4.1032595]
[4.1032642]
```
        mpr("You can control your flight.");
```
Replacement in crawl-ref/source/player.cc at line 3834 [4.962854]
B:BD[4.1032679] → [4.1032679:1032724]
```
        mpr( "You are about to teleport." );
```
[4.1032679]
[4.1032724]
```
        mpr("You are about to teleport.");
```
Replacement in crawl-ref/source/player.cc at line 3837 [4.962854]
B:BD[4.1032769] → [4.1032769:1032818]
```
        mpr( "You can control teleportation." );
```
[4.1032769]
[4.1032818]
```
        mpr("You can control teleportation.");
```
Replacement in crawl-ref/source/player.cc at line 3840 [4.962854]
B:BD[4.1032860] → [4.1032860:1032907]
```
        mpr( "You are channeling the dead." );
```
[4.1032860]
[4.1032907]
```
        mpr("You are channeling the dead.");
```
Replacement in crawl-ref/source/player.cc at line 3843 [4.962854]
B:BD[4.1032971] → [4.1032971:1033009]
```
        mpr( "You are forewarned." );
```
[4.1032971]
[4.1033009]
```
        mpr("You are forewarned.");
```
Replacement in crawl-ref/source/player.cc at line 3846 [4.962854]
B:BD[4.1033073] → [4.1033073:1033112]
```
        mpr( "You radiate silence." );
```
[4.1033073]
[4.1033112]
```
        mpr("You radiate silence.");
```
Replacement in crawl-ref/source/player.cc at line 3849 [4.962854]
B:BD[4.1033291] → [4.1033291:1033338]
```
        mpr( "Your skin is tough as stone." );
```
[4.1033291]
[4.1033338]
```
        mpr("Your skin is tough as stone.");
```
Replacement in crawl-ref/source/player.cc at line 3852 [4.962854]
B:BD[4.1033380] → [4.1033380:1033421]
```
        mpr( "You can see invisible." );
```
[4.1033380]
[4.1033421]
```
        mpr("You can see invisible.");
```
Replacement in crawl-ref/source/player.cc at line 3855 [4.962854]
∅:D[7.4921] → [4.1033441:1033478]
B:BD[4.1033441] → [4.1033441:1033478]
```
        mpr( "You are invisible." );
```
[7.4921]
[4.1033478]
```
        mpr("You are invisible.");
```
Replacement in crawl-ref/source/player.cc at line 3858 [4.962854]
∅:D[7.4954] → [4.1033497:1033533]
B:BD[4.1033497] → [4.1033497:1033533]
```
        mpr( "You are confused." );
```
[7.4954]
[8.3142]
```
        mpr("You are confused.");
```
Replacement in crawl-ref/source/player.cc at line 3861 [4.962854]
B:BD[8.3177] → [8.3177:3211]
```
        mpr( "You are beheld." );
```
[8.3177]
[4.1033533]
```
        mpr("You are beheld.");
```
Replacement in crawl-ref/source/player.cc at line 3865 [4.962854]
∅:D[7.4992] → [4.1033557:1033594]
B:BD[4.1033557] → [4.1033557:1033594]
```
        mpr( "You are paralysed." );
```
[7.4992]
[9.3732]
```
        mpr("You are paralysed.");
```
Replacement in crawl-ref/source/player.cc at line 3867 [4.962854]
B:BD[9.3769] → [9.3769:3806]
```
        mpr( "You are petrified." );
```
[9.3769]
[10.509]
```
        mpr("You are petrified.");
```
Replacement in crawl-ref/source/player.cc at line 3869 [4.962854]
B:BD[10.542] → [10.542:576]
```
        mpr( "You are asleep." );
```
[10.542]
[11.7413]
```
        mpr("You are asleep." );
```
Replacement in crawl-ref/source/player.cc at line 3872 [4.962854]
∅:D[7.5030] → [4.1033618:1033655]
B:BD[4.1033618] → [4.1033618:1033655]
```
        mpr( "You are exhausted." );
```
[7.5030]
[4.1033655]
```
        mpr("You are exhausted.");
```
Replacement in crawl-ref/source/player.cc at line 3875 [4.962854]
∅:D[7.5090] → [4.1033687:1033753]
B:BD[4.1033687] → [4.1033687:1033753]
```
        mpr( "You are under both slowing and hasting effects." );
```
[7.5090]
[7.5091]
```
        mpr("You are under both slowing and hasting effects.");
```
Replacement in crawl-ref/source/player.cc at line 3877 [4.962854]
∅:D[7.5128] → [12.53:96]
B:BD[4.1033776] → [12.53:96]
```
        mpr( "Your actions are slowed." );
```
[7.5128]
[7.5129]
```
        mpr("Your actions are slowed.");
```
Replacement in crawl-ref/source/player.cc at line 3879 [4.962854]
∅:D[7.5167] → [12.97:140]
B:BD[4.1033846] → [12.97:140]
```
        mpr( "Your actions are hasted." );
```
[7.5167]
[4.1033893]
```
        mpr("Your actions are hasted.");
```
Replacement in crawl-ref/source/player.cc at line 3882 [4.962854]
∅:D[7.5201] → [4.1033913:1033947]
B:BD[4.1033913] → [4.1033913:1033947]
```
        mpr( "You are mighty." );
```
[7.5201]
[4.1033947]
```
        mpr("You are mighty.");
```
Replacement in crawl-ref/source/player.cc at line 3885 [4.962854]
∅:D[3.4025] → [13.2589:2632]
B:BD[13.2589] → [13.2589:2632]
```
        mpr( "You are divinely robust." );
```
[3.4025]
[13.2632]
```
        mpr("You are divinely robust.");
```
Replacement in crawl-ref/source/player.cc at line 3888 [4.962854]
B:BD[2.2586] → [2.2586:2632]
```
        mpr( "You are divinely fortified." );
```
[2.2586]
[2.2632]
```
        mpr("You are divinely fortified.");
```
Replacement in crawl-ref/source/player.cc at line 3891 [4.962854]
∅:D[7.5239] → [4.1033971:1034028]
B:BD[4.1033971] → [4.1033971:1034028]
```
        mpr( "You are possessed by a berserker rage." );
```
[7.5239]
[4.1034028]
```
        mpr("You are possessed by a berserker rage.");
```
Replacement in crawl-ref/source/player.cc at line 3894 [4.962854]
∅:D[14.1042] → [4.1034061:1034113]
B:BD[4.1034061] → [4.1034061:1034113]
```
        mpr( "You are hovering above the floor." );
```
[14.1042]
[4.1034113]
```
        mpr("You are hovering above the floor.");
```
Replacement in crawl-ref/source/player.cc at line 3897 [4.962854]
∅:D[15.506] → [16.171:212]
B:BD[17.782] → [16.171:212]
```
        mpr( "You are held in a net." );
```
[15.506]
[17.826]
```
        mpr("You are held in a net.");
```

Replacement in crawl-ref/source/player.cc at line 3905 [4.962854]

∅:D[7.5459] → [18.9572:9620]

B:BD[18.9572] → [18.9572:9620]

                                  : "mildly" );

[7.5459]

[4.1034414]

                                                : "mildly" );

Replacement in crawl-ref/source/player.cc at line 3913 [4.962854]

B:BD[18.9741] → [18.9741:9789]

                                 : "mildly " );

[18.9741]

[4.1034672]

                                 : "mildly ");

Replacement in crawl-ref/source/player.cc at line 3920 [4.962854]
∅:D[19.2596] → [20.4044:4086]
B:BD[18.10128] → [20.4044:4086]
```
    contaminate_player( 0, false, true );
```
[19.2596]
[4.1035253]
```
    contaminate_player(0, false, true);
```

Replacement in crawl-ref/source/player.cc at line 3927 [4.962854]

B:BD[7.5649] → [21.4102:4170]

                                                      : "a soft" );

[7.5649]

[4.1035563]

                                                      : "a soft");

Replacement in crawl-ref/source/player.cc at line 3935 [4.962854]

B:BD[7.5806] → [21.4171:4233]

                                                 : "weak " );

[7.5806]

[4.1035844]

                                                 : "weak ");

Replacement in crawl-ref/source/player.cc at line 3938 [4.962854]

B:BD[22.349079] → [22.349079:349148]

    int move_cost = (player_speed() * player_movement_speed()) / 10;

[22.349079]

[22.349185]

    const int move_cost = (player_speed() * player_movement_speed()) / 10;

Replacement in crawl-ref/source/player.cc at line 6147 [4.962854]
B:BD[23.2729] → [23.2729:2781]
```
    return (duration[DUR_REPEL_UNDEAD]? piety : 0);
```
[23.2729]
[23.2781]
```
    return (duration[DUR_REPEL_UNDEAD] ? piety : 0);
```

Add miscellaneous minor fixes.

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/spl-cast.cc at line 1320 [4.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 1324 [4.293070]

Replacement in crawl-ref/source/player.cc at line 3786 [4.962854]

Replacement in crawl-ref/source/player.cc at line 3789 [4.962854]

Replacement in crawl-ref/source/player.cc at line 3792 [4.962854]

Replacement in crawl-ref/source/player.cc at line 3795 [4.962854]

Replacement in crawl-ref/source/player.cc at line 3798 [4.962854]

Replacement in crawl-ref/source/player.cc at line 3801 [4.962854]

Replacement in crawl-ref/source/player.cc at line 3804 [4.962854]

Replacement in crawl-ref/source/player.cc at line 3822 [4.962854]

Replacement in crawl-ref/source/player.cc at line 3825 [4.962854]

Replacement in crawl-ref/source/player.cc at line 3828 [4.962854]

Replacement in crawl-ref/source/player.cc at line 3831 [4.962854]

Replacement in crawl-ref/source/player.cc at line 3834 [4.962854]

Replacement in crawl-ref/source/player.cc at line 3837 [4.962854]

Replacement in crawl-ref/source/player.cc at line 3840 [4.962854]

Replacement in crawl-ref/source/player.cc at line 3843 [4.962854]

Replacement in crawl-ref/source/player.cc at line 3846 [4.962854]

Replacement in crawl-ref/source/player.cc at line 3849 [4.962854]

Replacement in crawl-ref/source/player.cc at line 3852 [4.962854]

Replacement in crawl-ref/source/player.cc at line 3855 [4.962854]

Replacement in crawl-ref/source/player.cc at line 3858 [4.962854]

Replacement in crawl-ref/source/player.cc at line 3861 [4.962854]

Replacement in crawl-ref/source/player.cc at line 3865 [4.962854]

Replacement in crawl-ref/source/player.cc at line 3867 [4.962854]

Replacement in crawl-ref/source/player.cc at line 3869 [4.962854]

Replacement in crawl-ref/source/player.cc at line 3872 [4.962854]

Replacement in crawl-ref/source/player.cc at line 3875 [4.962854]

Replacement in crawl-ref/source/player.cc at line 3877 [4.962854]

Replacement in crawl-ref/source/player.cc at line 3879 [4.962854]

Replacement in crawl-ref/source/player.cc at line 3882 [4.962854]

Replacement in crawl-ref/source/player.cc at line 3885 [4.962854]

Replacement in crawl-ref/source/player.cc at line 3888 [4.962854]

Replacement in crawl-ref/source/player.cc at line 3891 [4.962854]

Replacement in crawl-ref/source/player.cc at line 3894 [4.962854]

Replacement in crawl-ref/source/player.cc at line 3897 [4.962854]

Replacement in crawl-ref/source/player.cc at line 3905 [4.962854]

Replacement in crawl-ref/source/player.cc at line 3913 [4.962854]

Replacement in crawl-ref/source/player.cc at line 3920 [4.962854]

Replacement in crawl-ref/source/player.cc at line 3927 [4.962854]

Replacement in crawl-ref/source/player.cc at line 3935 [4.962854]

Replacement in crawl-ref/source/player.cc at line 3938 [4.962854]

Replacement in crawl-ref/source/player.cc at line 6147 [4.962854]