fiddlerwoaroof/crawl - Change RWH6IAVXQD3Q7ITNN5WOOUHBDBYURLXFEURA7QFHS4ZED2CG7MOQC

Add miscellaneous minor cleanups to prepare for the introduction of

Yred's injury mirroring: move the routine to make a visible monster flash a particular color into its own function, add an integer-based square root function based on Newton's method to stuff.cc, and adjust prayer lengths for Zin (1 turn), Yred (20 turns), Ely (same as Yred), and all gods who ignore prayers (same as Zin).

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

Created by dolorous on September 25, 2008

RWH6IAVXQD3Q7ITNN5WOOUHBDBYURLXFEURA7QFHS4ZED2CG7MOQC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/view.h at line 247 [6.13254]

[4.68]

[5.1119]

#ifndef USE_TILE
void flash_monster_colour(const monsters *mon, unsigned char fmc_colour,
                          int fmc_delay);
#endif

Insertion in crawl-ref/source/view.cc at line 4737 [6.16817]

[7.3341]

[4.5336]

}
#ifndef USE_TILE
void flash_monster_colour(const monsters *mon, unsigned char fmc_colour,
                          int fmc_delay)
{
    if (mons_near(mon) && player_monster_visible(mon))
    {
        unsigned char old_flash_colour = you.flash_colour;
        coord_def c(mon->pos());
        you.flash_colour = fmc_colour;
        view_update_at(c);
        update_screen();
        delay(fmc_delay);
        you.flash_colour = old_flash_colour;
        view_update_at(c);
        update_screen();
    }

Insertion in crawl-ref/source/view.cc at line 4759 [6.16817]
[4.5338]
[4.5338]
```
#endif
```
Insertion in crawl-ref/source/stuff.h at line 229 [6.217090]
[8.757]
[6.224522]
```
int integer_sqrt(int value);
```

Insertion in crawl-ref/source/stuff.cc at line 1650 [6.224557]

[9.1998]

[10.163]


int integer_sqrt(int value)
{
    if (value <= 0)
        return (value);

Insertion in crawl-ref/source/stuff.cc at line 1656 [6.224557]

[10.164]

    int very_old_retval = -1;
    int old_retval = 0;
    int retval = 1;
    while (very_old_retval != old_retval
        && very_old_retval != retval
        && retval != old_retval)
    {
        very_old_retval = old_retval;
        old_retval = retval;
        retval = (value / old_retval + old_retval) / 2;
    }
    return (retval);
}

Replacement in crawl-ref/source/religion.cc at line 1655 [6.804403]
B:BD[11.2900] → [12.5322:5344]
∅:D[12.5344] → [11.2924:2930]
B:BD[11.2924] → [11.2924:2930]
B:BD[11.2930] → [13.2626:2685]
B:BD[13.2685] → [3.4807:4845]
∅:D[3.4845] → [11.3016:3114]
B:BD[11.3016] → [11.3016:3114]
B:BD[11.3114] → [2.2524:2544]
∅:D[2.2544] → [11.3134:3207]
B:BD[11.3134] → [11.3134:3207]
B:BD[11.3207] → [3.4846:4871]
∅:D[3.4871] → [11.3207:3213]
B:BD[11.3207] → [11.3207:3213]
```
    if (see_follower)
    {
        unsigned char old_flash_colour = you.flash_colour;
        coord_def c(follower->pos());
        you.flash_colour = god_colour(god);
        view_update_at(c);
        update_screen();
        delay(200);
        you.flash_colour = old_flash_colour;
        view_update_at(c);
        update_screen();
    }
```
[11.2900]
[11.3213]
```
    flash_monster_colour(follower, god_colour(god), 200);
```

Replacement in crawl-ref/source/religion.cc at line 2025 [6.804403]

B:BD[14.3109] → [15.168:211]

    if (you.religion == GOD_NEMELEX_XOBEH)

[14.3109]

[15.211]

    if (!_god_accepts_prayer(you.religion) || you.religion == GOD_ZIN
        || you.religion == GOD_NEMELEX_XOBEH)
    {

Insertion in crawl-ref/source/religion.cc at line 2029 [6.804403]

[15.249]

[16.2952]

    }
    else if (you.religion == GOD_YREDELEMNUL || you.religion == GOD_ELYVILON)
        you.duration[DUR_PRAYER] = 20;