fiddlerwoaroof/crawl - Change JGKYRZ34S3I23PMJX6IUBR7EHEFD6I4XXEGXNT7GKT2M2VIRBSMQC

Properly save friendly pickup setting as a player variable (rather than

options). This increases the minor version by 1. Also, tidy up the checks of this settings.

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

Created by j-p-e-g on May 7, 2008

JGKYRZ34S3I23PMJX6IUBR7EHEFD6I4XXEGXNT7GKT2M2VIRBSMQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/tags.h at line 37 [6.161012]
B:BD[5.42462] → [5.42462:42505]
```
    TAGTYPE_PLAYER=0,           // Foo.sav
```
[5.42462]
[5.42505]
```
    TAGTYPE_PLAYER = 0,         // Foo.sav
```

Replacement in crawl-ref/source/tags.h at line 53 [6.161012]

B:BD[7.274] → [7.274:380]

    TAG_MINOR_PIETY = 2,        // Added piety_hysteresis
    TAG_MINOR_QUIVER = 3,       // Added quiver

[7.274]

[7.380]

    TAG_MINOR_PIETY   = 2,      // Added piety_hysteresis
    TAG_MINOR_QUIVER  = 3,      // Added quiver

Replacement in crawl-ref/source/tags.h at line 56 [6.161012]

B:BD[7.442] → [8.453:518]

    TAG_MINOR_MONNAM = 5,       // Monsters get individual names

[7.442]

[3.863]

    TAG_MINOR_MONNAM  = 5,      // Monsters get individual names

Replacement in crawl-ref/source/tags.h at line 58 [6.161012]

B:BD[3.938] → [3.938:989]

    TAG_MINOR_VERSION = 6       // Current version

[3.938]

[7.493]

    TAG_MINOR_FPICKUP = 7,      // Added pickup option for allied monsters.
    TAG_MINOR_VERSION = 7       // Current version

Insertion in crawl-ref/source/tags.cc at line 1011 [6.164589]

[9.292]

[6.184463]


    // minorVersion 7 starts here
    marshallByte(th, you.friendly_pickup);

Insertion in crawl-ref/source/tags.cc at line 1400 [6.164589]

[9.483]

[6.199467]


    if (minorVersion >= TAG_MINOR_FPICKUP)
        you.friendly_pickup = unmarshallByte(th);

Replacement in crawl-ref/source/tags.cc at line 2026 [6.164589]
B:BD[8.847] → [8.847:852]
```
    
```
[8.847]
[8.852]
Replacement in crawl-ref/source/tags.cc at line 2029 [6.164589]
B:BD[8.945] → [8.945:950]
```
    
```
[8.945]
[10.5956]

Replacement in crawl-ref/source/monstuff.cc at line 4854 [6.1396662]

B:BD[4.2640] → [4.2640:2708]

            // Same for friendlies if friendly_pickup is set to -1.

[4.2640]

[4.2708]

            // Same for friendlies if friendly_pickup is set to "none".

Replacement in crawl-ref/source/monstuff.cc at line 4856 [6.1396662]

B:BD[4.2781] → [4.2781:2859]

                && (!mons_friendly(monster) || Options.friendly_pickup >= 0))

[4.2781]

[11.1454]

                && (!mons_friendly(monster)
                    || you.friendly_pickup > FRIENDLY_PICKUP_NONE))

Replacement in crawl-ref/source/mon-util.cc at line 2944 [6.1699344]

B:BD[12.5522] → [4.3159:3214]

    // These don't need any launcher, and always okay.

[12.5522]

[4.3214]

    // These don't need any launcher, and are always okay.

Replacement in crawl-ref/source/mon-util.cc at line 3811 [6.1699344]

∅:D[13.4214] → [14.6651:6743]

B:BD[15.25319] → [14.6651:6743]

            if (Options.friendly_pickup < 0
                || Options.friendly_pickup == 0

[13.4214]

[14.6743]

            if (you.friendly_pickup == FRIENDLY_PICKUP_NONE
                || you.friendly_pickup == FRIENDLY_PICKUP_FRIEND

Replacement in crawl-ref/source/misc.cc at line 1480 [6.1933596]

B:BD[16.9397] → [16.9397:9447]

            you.entry_cause = EC_GOD_RETRIUBTION;

[16.9397]

[16.9447]

            you.entry_cause = EC_GOD_RETRIBUTION;

Replacement in crawl-ref/source/misc.cc at line 2125 [6.1933596]
∅:D[4.5157] → [14.7230:7297]
B:BD[16.11119] → [14.7230:7297]
```
        Options.friendly_pickup = Options.default_friendly_pickup;
```
[4.5157]
[14.7297]
```
        you.friendly_pickup = Options.default_friendly_pickup;
```

Replacement in crawl-ref/source/makeitem.cc at line 1783 [18.927]

B:BD[17.24935] → [4.5557:5639]

        item.quantity = 1^+ random2(9) + random2(12) + random2(15) + random2(12);

[17.24935]

[19.3456]

        item.quantity = 1 + random2(9) + random2(12) + random2(15) + random2(12);

Replacement in crawl-ref/source/initfile.cc at line 631 [6.2957258]

B:BD[20.791306] → [14.7720:7785]

    default_friendly_pickup = 0; // allies may only pickup items

[20.791306]

[21.4444]

    default_friendly_pickup = FRIENDLY_PICKUP_FRIEND;

Replacement in crawl-ref/source/initfile.cc at line 1808 [6.2957258]

B:BD[14.7922] → [4.7318:7360]

∅:D[4.7360] → [14.7956:7989]

B:BD[14.7956] → [14.7956:7989]

B:BD[14.7989] → [4.7361:7402]

            default_friendly_pickup = -1;
        else if (field == "all")
            default_friendly_pickup = 1;

[14.7922]

[14.8022]

            default_friendly_pickup = FRIENDLY_PICKUP_NONE;

Replacement in crawl-ref/source/initfile.cc at line 1810 [6.2957258]

B:BD[14.8058] → [4.7403:7444]

            default_friendly_pickup = 0;

[14.8058]

[14.8091]

            default_friendly_pickup = FRIENDLY_PICKUP_FRIEND;
        else if (field == "all")
            default_friendly_pickup = FRIENDLY_PICKUP_ALL;

Replacement in crawl-ref/source/externs.h at line 562 [6.3270163]

B:BD[22.1757] → [22.1757:1816]

  bool just_autoprayed;         // autopray just kicked in

[22.1757]

[23.6875]

  bool just_autoprayed;       // autopray just kicked in
  int  friendly_pickup;       // pickup setting for allies

Replacement in crawl-ref/source/externs.h at line 1018 [6.3270163]
B:BD[8.8972] → [8.8972:8977]
```
    
```
[8.8972]
[6.3280366]
Replacement in crawl-ref/source/externs.h at line 1065 [6.3270163]
B:BD[2.3388] → [2.3388:3393]
∅:D[2.3393] → [8.9098:9158]
B:BD[8.9098] → [8.9098:9158]
```
    
    const monsterentry *find_monsterentry() const;    
    
```
[2.3388]
[24.8774]
```
    const monsterentry *find_monsterentry() const;
```
Replacement in crawl-ref/source/externs.h at line 1083 [6.3270163]
B:BD[3.46313] → [3.46313:46318]
```
    
```
[3.46313]
[25.11526]
Deletion in crawl-ref/source/externs.h at line 1610 [6.3270163]
B:BD[14.8208] → [14.8208:8241]
```
    int         friendly_pickup;
```
Insertion in crawl-ref/source/enum.h at line 1375 [6.3287960]
[6.3326822]
[16.17264]
```
// reasons for entering the Abyss
```
Replacement in crawl-ref/source/enum.h at line 1383 [6.3287960]
B:BD[16.17476] → [16.17476:17500]
```
    EC_GOD_RETRIUBTION,
```
[16.17476]
[16.17500]
```
    EC_GOD_RETRIBUTION,
```

Insertion in crawl-ref/source/enum.h at line 2725 [6.3287960]

[6.3374148]

[6.3376769]

};
enum friendly_pickup_type
{
    FRIENDLY_PICKUP_NONE = 0,
    FRIENDLY_PICKUP_FRIEND,
    FRIENDLY_PICKUP_ALL

Replacement in crawl-ref/source/acr.cc at line 1854 [6.4397395]
B:BD[6.4424325] → [26.4976:5015]
```
    if (Options.friendly_pickup == -1)
```
[6.4424325]
[26.5015]
```
    if (you.friendly_pickup == FRIENDLY_PICKUP_NONE)
```
Replacement in crawl-ref/source/acr.cc at line 1859 [6.4397395]
B:BD[26.5126] → [26.5126:5169]
```
    else if (Options.friendly_pickup == 0)
```
[26.5126]
[26.5169]
```
    else if (you.friendly_pickup == FRIENDLY_PICKUP_FRIEND)
```
Replacement in crawl-ref/source/acr.cc at line 1864 [6.4397395]
B:BD[26.5280] → [26.5280:5323]
```
    else if (Options.friendly_pickup == 1)
```
[26.5280]
[26.5323]
```
    else if (you.friendly_pickup == FRIENDLY_PICKUP_ALL)
```

Replacement in crawl-ref/source/acr.cc at line 2043 [6.4397395]

B:BD[26.5651] → [26.5651:5731]

        mpr("Change to (n)othing, (f)riend-dropped, or (a)ll? ", MSGCH_PROMPT);

[26.5651]

[26.5731]

        mpr("Change to (d)efault, (n)othing, (f)riend-dropped, or (a)ll? ",
            MSGCH_PROMPT);

Replacement in crawl-ref/source/acr.cc at line 2049 [6.4397395]

B:BD[26.5810] → [26.5810:5877]

        if (type == 'n')
            Options.friendly_pickup = -1;

[26.5810]

[26.5877]

        if (type == 'd')
            you.friendly_pickup = Options.default_friendly_pickup;
        else if (type == 'n')
            you.friendly_pickup = FRIENDLY_PICKUP_NONE;

Replacement in crawl-ref/source/acr.cc at line 2054 [6.4397395]
∅:D[26.5907] → [14.8963:9004]
B:BD[14.8963] → [14.8963:9004]
```
            Options.friendly_pickup = 0;
```
[26.5907]
[26.5908]
```
            you.friendly_pickup = FRIENDLY_PICKUP_FRIEND;
```
Replacement in crawl-ref/source/acr.cc at line 2056 [6.4397395]
∅:D[26.5938] → [14.9149:9190]
B:BD[14.9149] → [14.9149:9190]
```
            Options.friendly_pickup = 1;
```
[26.5938]
[14.9268]
```
            you.friendly_pickup = FRIENDLY_PICKUP_ALL;
```

Replacement in crawl-ref/source/acr.cc at line 4038 [6.4397395]

B:BD[20.1280205] → [27.11365:11432]

        Options.friendly_pickup = Options.default_friendly_pickup;

[20.1280205]

[27.11432]

        you.friendly_pickup = Options.default_friendly_pickup;

Properly save friendly pickup setting as a player variable (rather than

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/tags.h at line 37 [6.161012]

Replacement in crawl-ref/source/tags.h at line 53 [6.161012]

Replacement in crawl-ref/source/tags.h at line 56 [6.161012]

Replacement in crawl-ref/source/tags.h at line 58 [6.161012]

Insertion in crawl-ref/source/tags.cc at line 1011 [6.164589]

Insertion in crawl-ref/source/tags.cc at line 1400 [6.164589]

Replacement in crawl-ref/source/tags.cc at line 2026 [6.164589]

Replacement in crawl-ref/source/tags.cc at line 2029 [6.164589]

Replacement in crawl-ref/source/monstuff.cc at line 4854 [6.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 4856 [6.1396662]

Replacement in crawl-ref/source/mon-util.cc at line 2944 [6.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 3811 [6.1699344]

Replacement in crawl-ref/source/misc.cc at line 1480 [6.1933596]

Replacement in crawl-ref/source/misc.cc at line 2125 [6.1933596]

Replacement in crawl-ref/source/makeitem.cc at line 1783 [18.927]

Replacement in crawl-ref/source/initfile.cc at line 631 [6.2957258]

Replacement in crawl-ref/source/initfile.cc at line 1808 [6.2957258]

Replacement in crawl-ref/source/initfile.cc at line 1810 [6.2957258]

Replacement in crawl-ref/source/externs.h at line 562 [6.3270163]

Replacement in crawl-ref/source/externs.h at line 1018 [6.3270163]

Replacement in crawl-ref/source/externs.h at line 1065 [6.3270163]

Replacement in crawl-ref/source/externs.h at line 1083 [6.3270163]

Deletion in crawl-ref/source/externs.h at line 1610 [6.3270163]

Insertion in crawl-ref/source/enum.h at line 1375 [6.3287960]

Replacement in crawl-ref/source/enum.h at line 1383 [6.3287960]

Insertion in crawl-ref/source/enum.h at line 2725 [6.3287960]

Replacement in crawl-ref/source/acr.cc at line 1854 [6.4397395]

Replacement in crawl-ref/source/acr.cc at line 1859 [6.4397395]

Replacement in crawl-ref/source/acr.cc at line 1864 [6.4397395]

Replacement in crawl-ref/source/acr.cc at line 2043 [6.4397395]

Replacement in crawl-ref/source/acr.cc at line 2049 [6.4397395]

Replacement in crawl-ref/source/acr.cc at line 2054 [6.4397395]

Replacement in crawl-ref/source/acr.cc at line 2056 [6.4397395]

Replacement in crawl-ref/source/acr.cc at line 4038 [6.4397395]