fiddlerwoaroof/crawl - Change H6ZPCZ7HN5UZTOS6QFAE4WUJR6BCDU4OB7ONQ7ELXIK65ASPJOTAC

Expand restore_stat() to allow for more fine-grained constrol of stat

restoration; the amount to be restored can now be specified. Use this where necessary.

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

Created by dolorous on April 20, 2008

H6ZPCZ7HN5UZTOS6QFAE4WUJR6BCDU4OB7ONQ7ELXIK65ASPJOTAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/spl-cast.cc at line 1221 [4.293070]
B:BD[4.321795] → [4.321795:321839]
```
        restore_stat(STAT_STRENGTH, false);
```
[4.321795]
[4.321839]
```
        restore_stat(STAT_STRENGTH, 0, false);
```
Replacement in crawl-ref/source/spl-cast.cc at line 1225 [4.293070]
B:BD[4.321892] → [4.321892:321940]
```
        restore_stat(STAT_INTELLIGENCE, false);
```
[4.321892]
[4.321940]
```
        restore_stat(STAT_INTELLIGENCE, 0, false);
```
Replacement in crawl-ref/source/spl-cast.cc at line 1229 [4.293070]
B:BD[4.321990] → [4.321990:322035]
```
        restore_stat(STAT_DEXTERITY, false);
```
[4.321990]
[4.322035]
```
        restore_stat(STAT_DEXTERITY, 0, false);
```

Replacement in crawl-ref/source/spells2.h at line 127 [4.562867]

B:BD[4.567334] → [4.567334:567398]

bool restore_stat(unsigned char which_stat, bool suppress_msg);

[4.567334]

[4.567398]

bool restore_stat(unsigned char which_stat, unsigned char stat_gain,
                  bool suppress_msg);

Replacement in crawl-ref/source/spells2.cc at line 692 [4.569242]

B:BD[4.585239] → [4.585239:585302]

bool restore_stat(unsigned char which_stat, bool suppress_msg)

[4.585239]

[4.585302]

// Restore the stat in which_stat by the amount in stat_gain, displaying
// a message if suppress_msg is false.  If stat_gain is 0, restore the
// stat completely.
bool restore_stat(unsigned char which_stat, unsigned char stat_gain,
                  bool suppress_msg)

Replacement in crawl-ref/source/spells2.cc at line 698 [4.569242]
B:BD[4.585304] → [4.585304:585335]
```
    bool statRestored = false;
```
[4.585304]
[4.585335]
```
    bool stat_restored = false;
```

Replacement in crawl-ref/source/spells2.cc at line 704 [4.569242]

B:BD[4.585487] → [4.585487:585565]

        for (unsigned char loopy = STAT_STRENGTH; loopy < NUM_STATS; loopy++)

[4.585487]

[4.585565]

        for (unsigned char loopy = STAT_STRENGTH; loopy < NUM_STATS; ++loopy)

Replacement in crawl-ref/source/spells2.cc at line 706 [4.569242]

B:BD[4.585575] → [4.585575:585671]

            if (restore_stat(loopy, suppress_msg) == true)
                statRestored = true;

[4.585575]

[4.585671]

            if (restore_stat(loopy, stat_gain, suppress_msg))
                stat_restored = true;

Replacement in crawl-ref/source/spells2.cc at line 709 [4.569242]

B:BD[4.585681] → [4.585681:585748]

        return statRestored;                 // early return {dlb}

[4.585681]

[4.585748]

        return stat_restored;                // early return {dlb}

Deletion in crawl-ref/source/spells2.cc at line 732 [4.569242]

B:BD[4.586334] → [4.586334:586359]

B:BD[4.586359] → [5.16174:16202]

∅:D[5.16202] → [4.586425:586552]

B:BD[4.586425] → [4.586425:586552]

    case STAT_DEXTERITY:
        msg += "dexterity";
        ptr_stat = &you.dex;
        ptr_stat_max = &you.max_dex;
        ptr_redraw = &you.redraw_dexterity;
        break;

Insertion in crawl-ref/source/spells2.cc at line 738 [4.569242]

[4.586767]

        break;
    case STAT_DEXTERITY:
        msg += "dexterity";
        ptr_stat = &you.dex;
        ptr_stat_max = &you.max_dex;
        ptr_redraw = &you.redraw_dexterity;

Replacement in crawl-ref/source/spells2.cc at line 753 [4.569242]
B:BD[5.16294] → [5.16294:16324]
```
            mpr(msg.c_str());
```
[5.16294]
[4.586941]
```
            mpr(msg.c_str(), MSGCH_RECOVERY);
```

Replacement in crawl-ref/source/spells2.cc at line 755 [4.569242]

B:BD[4.586942] → [4.586942:587031]

        *ptr_stat = *ptr_stat_max;
        *ptr_redraw = 1;
        statRestored = true;

[4.586942]

[4.587031]

        if (stat_gain == 0 || *ptr_stat + stat_gain > *ptr_stat_max)
            stat_gain = *ptr_stat_max - *ptr_stat;

Replacement in crawl-ref/source/spells2.cc at line 758 [4.569242]

B:BD[4.587032] → [4.587032:587100]

        if (ptr_stat == &you.strength)
            burden_change();

[4.587032]

[4.587100]

        if (stat_gain != 0)
        {
            *ptr_stat += stat_gain;
            *ptr_redraw = true;
            stat_restored = true;
            if (ptr_stat == &you.strength)
                burden_change();
        }

Replacement in crawl-ref/source/spells2.cc at line 769 [4.569242]
B:BD[4.587107] → [4.587107:587132]
```
    return statRestored;
```
[4.587107]
[4.587132]
```
    return stat_restored;
```

Replacement in crawl-ref/source/it_use2.cc at line 324 [4.2904329]

B:BD[3.4023] → [3.4023:4086]

        if (!restore_stat(STAT_ALL, false) && nothing_happens)

[3.4023]

[4.2911526]

        if (!restore_stat(STAT_ALL, 0, false) && nothing_happens)

Replacement in crawl-ref/source/food.cc at line 1289 [4.3043806]
B:BD[4.3073452] → [4.3073452:3073495]
```
            restore_stat(STAT_ALL, false);
```
[4.3073452]
[4.3073495]
```
            restore_stat(STAT_ALL, 0, false);
```
Replacement in crawl-ref/source/food.cc at line 1796 [4.3043806]
∅:D[6.2143] → [7.20305:20385]
B:BD[7.20305] → [7.20305:20385]
B:BD[7.20385] → [6.2144:2180]
B:BD[6.2180] → [8.1754:1779]
∅:D[8.1779] → [7.20418:20424]
∅:D[6.2180] → [7.20418:20424]
B:BD[7.20418] → [7.20418:20424]
```
    {
        mpr("You feel your strength returning.");
        you.strength++;
        you.redraw_strength = true;
        burden_change();
    }
```
[6.2143]
[7.20424]
```
        restore_stat(STAT_STRENGTH, 1, false);
```
Deletion in crawl-ref/source/enum.h at line 2590 [4.3287960]
B:BD[4.3369314] → [4.3369314:3369332]
```
  STAT_DEXTERITY,
```
Insertion in crawl-ref/source/enum.h at line 2591 [4.3287960]
[4.3369353]
[4.3369353]
```
  STAT_DEXTERITY,
```
Insertion in crawl-ref/source/effects.cc at line 53 [4.3382105]
[4.3382721]
[4.3382721]
```
#include "spells2.h"
```

Replacement in crawl-ref/source/effects.cc at line 2381 [4.3382105]

B:BD[9.9791] → [9.9791:9946]

        {
            mpr("You feel your strength returning.", MSGCH_RECOVERY);
            you.strength++;
            you.redraw_strength = 1;
        }

[9.9791]

[9.9946]

            restore_stat(STAT_STRENGTH, 0, false);
        if (you.intel < you.max_intel && one_chance_in(100))
            restore_stat(STAT_INTELLIGENCE, 0, false);

Replacement in crawl-ref/source/effects.cc at line 2387 [4.3382105]

B:BD[9.10004] → [9.10004:10378]

        {
            mpr("You feel your dexterity returning.", MSGCH_RECOVERY);
            you.dex++;
            you.redraw_dexterity = 1;
        }
        if (you.intel < you.max_intel && one_chance_in(100))
        {
            mpr("You feel your intelligence returning.", MSGCH_RECOVERY);
            you.intel++;
            you.redraw_intelligence = 1;
        }

[9.10004]

[9.10378]

            restore_stat(STAT_DEXTERITY, 0, false);

Replacement in crawl-ref/source/abl-show.cc at line 1011 [4.4494389]

B:BD[4.4509481] → [2.198:258]

        bool did_restore = restore_stat( STAT_ALL, false );

[4.4509481]

[2.258]

        bool did_restore = restore_stat( STAT_ALL, 0, false );

Replacement in crawl-ref/source/abl-show.cc at line 1662 [4.4494389]
B:BD[4.4528105] → [4.4528105:4528146]
```
        restore_stat( STAT_ALL, false );
```
[4.4528105]
[4.4528146]
```
        restore_stat( STAT_ALL, 0, false );
```

Expand restore_stat() to allow for more fine-grained constrol of stat

Dependencies

In channels

Change contents

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

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

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

Replacement in crawl-ref/source/spells2.h at line 127 [4.562867]

Replacement in crawl-ref/source/spells2.cc at line 692 [4.569242]

Replacement in crawl-ref/source/spells2.cc at line 698 [4.569242]

Replacement in crawl-ref/source/spells2.cc at line 704 [4.569242]

Replacement in crawl-ref/source/spells2.cc at line 706 [4.569242]

Replacement in crawl-ref/source/spells2.cc at line 709 [4.569242]

Deletion in crawl-ref/source/spells2.cc at line 732 [4.569242]

Insertion in crawl-ref/source/spells2.cc at line 738 [4.569242]

Replacement in crawl-ref/source/spells2.cc at line 753 [4.569242]

Replacement in crawl-ref/source/spells2.cc at line 755 [4.569242]

Replacement in crawl-ref/source/spells2.cc at line 758 [4.569242]

Replacement in crawl-ref/source/spells2.cc at line 769 [4.569242]

Replacement in crawl-ref/source/it_use2.cc at line 324 [4.2904329]

Replacement in crawl-ref/source/food.cc at line 1289 [4.3043806]

Replacement in crawl-ref/source/food.cc at line 1796 [4.3043806]

Deletion in crawl-ref/source/enum.h at line 2590 [4.3287960]

Insertion in crawl-ref/source/enum.h at line 2591 [4.3287960]

Insertion in crawl-ref/source/effects.cc at line 53 [4.3382105]

Replacement in crawl-ref/source/effects.cc at line 2381 [4.3382105]

Replacement in crawl-ref/source/effects.cc at line 2387 [4.3382105]

Replacement in crawl-ref/source/abl-show.cc at line 1011 [4.4494389]

Replacement in crawl-ref/source/abl-show.cc at line 1662 [4.4494389]