fiddlerwoaroof/crawl - Change WG6O475IOLZFMUQSLVR2KHM7XTBF5HH276L2KDGF7UOSESDOAILQC

Running now respects travel_delay.

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

Created by haranp on June 30, 2007

WG6O475IOLZFMUQSLVR2KHM7XTBF5HH276L2KDGF7UOSESDOAILQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/view.cc at line 3904 [3.16817]

B:BD[3.106409] → [2.7346:7408]

∅:D[2.7408] → [4.68113:68119]

B:BD[4.68113] → [4.68113:68119]

B:BD[4.68119] → [2.7409:7475]

∅:D[2.7475] → [4.68170:68299]

B:BD[4.68170] → [4.68170:68299]

    for (count_x = 0; count_x < ENV_SHOW_DIAMETER; count_x++)
    {
        for (count_y = 0; count_y < ENV_SHOW_DIAMETER; count_y++)
        {
            env.show_col[count_x][count_y] = LIGHTGREY;
            Show_Backup[count_x][count_y] = 0;
        }
    }

[3.106409]

[3.107648]

    env.show_col.init(LIGHTGREY);
    Show_Backup.init(0);

Replacement in crawl-ref/source/view.cc at line 4086 [3.16817]

B:BD[4.74648] → [4.74648:74724]

        if (!you.running || (you.running < 0 && Options.travel_delay > -1))

[4.74648]

[4.74724]

        if (!you.running || (Options.travel_delay > -1))

Deletion in crawl-ref/source/stuff.cc at line 594 [3.224557]
B:BD[3.239309] → [5.556:569]
∅:D[5.569] → [3.239332:239333]
B:BD[3.239332] → [3.239332:239333]
```
    int tmp;
```
Replacement in crawl-ref/source/stuff.cc at line 601 [3.224557]
B:BD[3.239385] → [5.570:593]
```
        tmp = getch();
```
[3.239385]
[3.239424]
```
        int tmp = getch();
```
Deletion in crawl-ref/source/stuff.cc at line 629 [3.224557]
B:BD[4.106202] → [4.106202:106226]
```
    unsigned char tmp;
```
Replacement in crawl-ref/source/stuff.cc at line 634 [3.224557]
B:BD[4.106325] → [4.106325:106364]
```
        tmp = (unsigned char) getch();
```
[4.106325]
[4.106364]
```
        int tmp = getch();
```

Replacement in crawl-ref/source/stuff.cc at line 636 [3.224557]

B:BD[4.106365] → [6.71312:71365]

        if ( tmp == 27 || tmp == 'q' || tmp == 'Q' )

[4.106365]

[6.71365]

        if ( tmp == ESCAPE || tmp == 'q' || tmp == 'Q' )

Replacement in crawl-ref/source/spl-cast.h at line 45 [3.291319]

B:BD[3.292484] → [7.11039:11120]

spret_type your_spells( spell_type spc2, int powc = 0, bool allow_fail = true );

[3.292484]

[3.292552]

spret_type your_spells( spell_type spell, int powc = 0,
                        bool allow_fail = true );

Replacement in crawl-ref/source/spl-cast.cc at line 685 [3.293070]

B:BD[3.309040] → [7.11376:11445]

void spellcasting_side_effects(spell_type spc2, bool idonly = false)

[3.309040]

[4.128025]

void spellcasting_side_effects(spell_type spell, bool idonly = false)

Replacement in crawl-ref/source/spl-cast.cc at line 700 [3.293070]

B:BD[3.309574] → [3.309574:309625]

            if (spell_typematch(spc2, SPTYP_FIRE))

[3.309574]

[3.309625]

            if (spell_typematch(spell, SPTYP_FIRE))

Replacement in crawl-ref/source/spl-cast.cc at line 702 [3.293070]

B:BD[3.309682] → [3.309682:309737]

            else if (spell_typematch(spc2, SPTYP_ICE))

[3.309682]

[3.309737]

            else if (spell_typematch(spell, SPTYP_ICE))

Replacement in crawl-ref/source/spl-cast.cc at line 706 [3.293070]

B:BD[3.309837] → [3.309837:309887]

            if (spell_typematch(spc2, SPTYP_ICE))

[3.309837]

[3.309887]

            if (spell_typematch(spell, SPTYP_ICE))

Replacement in crawl-ref/source/spl-cast.cc at line 708 [3.293070]

B:BD[3.309943] → [3.309943:309999]

            else if (spell_typematch(spc2, SPTYP_FIRE))

[3.309943]

[3.309999]

            else if (spell_typematch(spell, SPTYP_FIRE))

Replacement in crawl-ref/source/spl-cast.cc at line 712 [3.293070]

B:BD[3.310099] → [3.310099:310149]

            if (spell_typematch(spc2, SPTYP_AIR))

[3.310099]

[3.310149]

            if (spell_typematch(spell, SPTYP_AIR))

Replacement in crawl-ref/source/spl-cast.cc at line 714 [3.293070]

B:BD[3.310205] → [3.310205:310262]

            else if (spell_typematch(spc2, SPTYP_EARTH))

[3.310205]

[3.310262]

            else if (spell_typematch(spell, SPTYP_EARTH))

Replacement in crawl-ref/source/spl-cast.cc at line 718 [3.293070]

B:BD[3.310365] → [3.310365:310417]

            if (spell_typematch(spc2, SPTYP_EARTH))

[3.310365]

[3.310417]

            if (spell_typematch(spell, SPTYP_EARTH))

Replacement in crawl-ref/source/spl-cast.cc at line 720 [3.293070]

B:BD[3.310475] → [3.310475:310530]

            else if (spell_typematch(spc2, SPTYP_AIR))

[3.310475]

[3.310530]

            else if (spell_typematch(spell, SPTYP_AIR))

Replacement in crawl-ref/source/spl-cast.cc at line 724 [3.293070]

B:BD[3.310632] → [3.310632:310685]

            if (spell_typematch(spc2, SPTYP_POISON))

[3.310632]

[3.310685]

            if (spell_typematch(spell, SPTYP_POISON))

Replacement in crawl-ref/source/spl-cast.cc at line 728 [3.293070]

B:BD[3.310789] → [3.310789:310846]

            if (spell_typematch(spc2, SPTYP_NECROMANCY))

[3.310789]

[3.310846]

            if (spell_typematch(spell, SPTYP_NECROMANCY))

Replacement in crawl-ref/source/spl-cast.cc at line 732 [3.293070]

B:BD[3.310954] → [3.310954:311012]

            if (spell_typematch(spc2, SPTYP_CONJURATION))

[3.310954]

[3.311012]

            if (spell_typematch(spell, SPTYP_CONJURATION))

Replacement in crawl-ref/source/spl-cast.cc at line 736 [3.293070]

B:BD[3.311122] → [3.311122:311180]

            if (spell_typematch(spc2, SPTYP_ENCHANTMENT))

[3.311122]

[3.311180]

            if (spell_typematch(spell, SPTYP_ENCHANTMENT))

Replacement in crawl-ref/source/spl-cast.cc at line 740 [3.293070]

B:BD[3.311288] → [3.311288:311344]

            if (spell_typematch(spc2, SPTYP_SUMMONING))

[3.311288]

[3.311344]

            if (spell_typematch(spell, SPTYP_SUMMONING))

Replacement in crawl-ref/source/spl-cast.cc at line 763 [3.293070]

B:BD[3.311998] → [4.128282:128399]

    if (!spell_is_utility_spell(spc2))
        did_god_conduct( DID_SPELL_NONUTILITY, 10 + spell_difficulty(spc2) );

[3.311998]

[4.128399]

    if (!spell_is_utility_spell(spell))
        did_god_conduct( DID_SPELL_NONUTILITY, 10 + spell_difficulty(spell) );

Replacement in crawl-ref/source/spl-cast.cc at line 766 [3.293070]

B:BD[4.128400] → [4.128400:128509]

    if (spell_is_unholy( spc2 ))
        did_god_conduct( DID_UNHOLY, 10 + spell_difficulty(spc2) );

[4.128400]

[4.128509]

    if (spell_is_unholy( spell ))
        did_god_conduct( DID_UNHOLY, 10 + spell_difficulty(spell) );

Replacement in crawl-ref/source/spl-cast.cc at line 771 [3.293070]
B:BD[4.128661] → [4.128661:128704]
```
    if (spell_typematch(spc2, SPTYP_FIRE))
```
[4.128661]
[4.128704]
```
    if (spell_typematch(spell, SPTYP_FIRE))
```
Replacement in crawl-ref/source/spl-cast.cc at line 774 [3.293070]
B:BD[4.128753] → [4.128753:128804]
```
    if (spell_typematch( spc2, SPTYP_NECROMANCY ))
```
[4.128753]
[4.128804]
```
    if (spell_typematch( spell, SPTYP_NECROMANCY ))
```

Replacement in crawl-ref/source/spl-cast.cc at line 776 [3.293070]

B:BD[4.128810] → [4.128810:128882]

        did_god_conduct( DID_NECROMANCY, 10 + spell_difficulty(spc2) );

[4.128810]

[4.128882]

        did_god_conduct( DID_NECROMANCY, 10 + spell_difficulty(spell) );

Replacement in crawl-ref/source/spl-cast.cc at line 778 [3.293070]
B:BD[4.128883] → [4.128883:128923]
```
        if (spc2 == SPELL_NECROMUTATION
```
[4.128883]
[4.128923]
```
        if (spell == SPELL_NECROMUTATION
```

Replacement in crawl-ref/source/spl-cast.cc at line 820 [3.293070]

B:BD[8.5580] → [7.11446:11515]

spret_type your_spells( spell_type spc2, int powc, bool allow_fail )

[8.5580]

[4.129389]

spret_type your_spells( spell_type spell, int powc, bool allow_fail )

Replacement in crawl-ref/source/spl-cast.cc at line 828 [3.293070]
B:BD[8.5582] → [8.5582:5617]
```
    if (spell_is_uncastable(spc2))
```
[8.5582]
[8.5617]
```
    if (spell_is_uncastable(spell))
```
Replacement in crawl-ref/source/spl-cast.cc at line 831 [3.293070]
B:BD[4.129613] → [8.5648:5693]
```
    const int flags = get_spell_flags(spc2);
```
[4.129613]
[8.5693]
```
    const int flags = get_spell_flags(spell);
```

Replacement in crawl-ref/source/spl-cast.cc at line 846 [3.293070]

B:BD[8.6323] → [9.217:277]

        const char *prompt = get_spell_target_prompt(spc2);

[8.6323]

[10.29]

        const char *prompt = get_spell_target_prompt(spell);

Replacement in crawl-ref/source/spl-cast.cc at line 855 [3.293070]

B:BD[8.6547] → [8.6547:6674]

            if (spc2 == SPELL_TELEPORT_OTHER || spc2 == SPELL_HEAL_OTHER
                    || spc2 == SPELL_POLYMORPH_OTHER)

[8.6547]

[8.6674]

            if (spell == SPELL_TELEPORT_OTHER || spell == SPELL_HEAL_OTHER
                    || spell == SPELL_POLYMORPH_OTHER)

Replacement in crawl-ref/source/spl-cast.cc at line 871 [3.293070]
B:BD[4.129701] → [4.129701:129748]
```
        powc = calc_spell_power( spc2, true );
```
[4.129701]
[4.129748]
```
        powc = calc_spell_power( spell, true );
```
Replacement in crawl-ref/source/spl-cast.cc at line 873 [3.293070]
∅:D[4.129749] → [3.311998:312021]
B:BD[3.311998] → [3.311998:312021]
```
    surge_power(spc2);
```
[4.129749]
[3.312021]
```
    surge_power(spell);
```
Replacement in crawl-ref/source/spl-cast.cc at line 893 [3.293070]
B:BD[3.312599] → [3.312599:312636]
```
        if (spfl < spell_fail(spc2))
```
[3.312599]
[3.312636]
```
        if (spfl < spell_fail(spell))
```

Replacement in crawl-ref/source/spl-cast.cc at line 895 [3.293070]

B:BD[3.312646] → [4.129966:130017]

            spellcasting_side_effects(spc2, true);

[3.312646]

[4.130017]

            spellcasting_side_effects(spell, true);

Replacement in crawl-ref/source/spl-cast.cc at line 913 [3.293070]

B:BD[3.313145] → [3.313145:313199]

            } while (!spell_typematch(spc2, sptype));

[3.313145]

[3.313199]

            } while (!spell_typematch(spell, sptype));

Replacement in crawl-ref/source/spl-cast.cc at line 920 [3.293070]

B:BD[3.313499] → [3.313499:313634]

            int nastiness = spell_mana(spc2) * spell_mana(spc2)
                                    * (spell_fail(spc2) - spfl) + 250;

[3.313499]

[3.313634]

            int nastiness = spell_mana(spell) * spell_mana(spell)
                                    * (spell_fail(spell) - spfl) + 250;

Replacement in crawl-ref/source/spl-cast.cc at line 927 [3.293070]

B:BD[3.313843] → [11.245:359]

            miscast_effect( sptype, spell_mana(spc2),
                            spell_fail(spc2) - spfl, 100 );

[3.313843]

[3.313929]

            miscast_effect( sptype, spell_mana(spell),
                            spell_fail(spell) - spfl, 100 );

Replacement in crawl-ref/source/spl-cast.cc at line 935 [3.293070]

B:BD[3.315916] → [12.621:686]

    mprf(MSGCH_DIAGNOSTICS, "Spell #%d, power=%d", spc2, powc );

[3.315916]

[3.316020]

    mprf(MSGCH_DIAGNOSTICS, "Spell #%d, power=%d", spell, powc );

Replacement in crawl-ref/source/spl-cast.cc at line 938 [3.293070]
∅:D[4.130223] → [3.316028:316046]
B:BD[3.316028] → [3.316028:316046]
```
    switch (spc2)
```
[4.130223]
[3.316046]
```
    switch (spell)
```
Replacement in crawl-ref/source/spl-cast.cc at line 1826 [3.293070]
B:BD[3.341652] → [4.133553:133590]
```
    spellcasting_side_effects(spc2);
```
[3.341652]
[4.133590]
```
    spellcasting_side_effects(spell);
```

Insertion in crawl-ref/source/delay.cc at line 799 [3.3963459]

[4.1011384]

    else if (Options.travel_delay > 0)
    {
        delay(Options.travel_delay);
    }