fiddlerwoaroof/crawl - Change DHI4FAUHYA3V7I2LKBE74AA672FVDUE2LBOZHTTL3EAE4YJP2ICAC

[2070013]: newly created, animated, etc. friendly monsters now default to

'follow me' behaviour, rather than following your last command (even if was before they were summoned.) Their behaviour can still be changed by giving them commands, of course. The previous behaviour was clearly intentional so I'm not too sure about this change; feel free to revert if I'm missing something.

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

Created by haranp on February 3, 2009

DHI4FAUHYA3V7I2LKBE74AA672FVDUE2LBOZHTTL3EAE4YJP2ICAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/xom.cc at line 818 [9.3]

B:BD[8.2443] → [8.2443:2496]

                          you.pos(), you.pet_target,

[8.2443]

[8.2496]

                          you.pos(), MHITYOU,

Deletion in crawl-ref/source/xom.cc at line 901 [9.3]
B:BD[5.472] → [5.472:517]
```
    unsigned short hitting = you.pet_target;
```
Deletion in crawl-ref/source/xom.cc at line 904 [9.3]
B:BD[5.614] → [5.614:620]
```
    {
```
Deletion in crawl-ref/source/xom.cc at line 905 [9.3]
B:BD[5.648] → [5.648:681]
```
        hitting = MHITYOU;
    }
```

Replacement in crawl-ref/source/xom.cc at line 910 [9.3]

B:BD[5.802] → [5.802:844]

                      you.pos(), hitting,

[5.802]

[5.844]

                      you.pos(), MHITYOU,

Deletion in crawl-ref/source/xom.cc at line 1045 [9.3]
B:BD[5.4419] → [5.4419:4464]
```
    unsigned short hitting = you.pet_target;
```
Deletion in crawl-ref/source/xom.cc at line 1048 [9.3]
B:BD[5.4563] → [5.4563:4569]
```
    {
```
Deletion in crawl-ref/source/xom.cc at line 1049 [9.3]
B:BD[5.4597] → [5.4597:4630]
```
        hitting = MHITYOU;
    }
```

Replacement in crawl-ref/source/xom.cc at line 1053 [9.3]

B:BD[5.4751] → [5.4751:4846]

                      0, 0, you.pos(), hitting,
                      MG_FORCE_BEH, GOD_XOM));

[5.4751]

[5.4846]

                      0, 0, you.pos(), MHITYOU, MG_FORCE_BEH, GOD_XOM));

Replacement in crawl-ref/source/spl-cast.cc at line 1609 [10.293070]

B:BD[7.340] → [7.340:394]

                            you.pet_target, god) < 0)

[7.340]

[7.394]

                            MHITYOU, god) < 0)

Replacement in crawl-ref/source/spl-cast.cc at line 1618 [10.293070]

∅:D[7.530] → [11.1550:1623]

B:BD[12.1972] → [11.1550:1623]

        animate_dead(&you, powc + 1, BEH_FRIENDLY, you.pet_target, god);

[7.530]

[13.310]

        animate_dead(&you, powc + 1, BEH_FRIENDLY, MHITYOU, god);

Replacement in crawl-ref/source/spells3.cc at line 407 [10.531613]

B:BD[14.215] → [15.1137:1270]

∅:D[15.1270] → [11.4178:4221]

B:BD[16.1352] → [11.4178:4221]

            mgen_data(mon, BEH_FRIENDLY,
                      dur, SPELL_CALL_IMP,
                      you.pos(), you.pet_target,
                      MG_FORCE_BEH, god));

[14.215]

[14.285]

            mgen_data(mon, BEH_FRIENDLY, dur, SPELL_CALL_IMP,
                      you.pos(), MHITYOU, MG_FORCE_BEH, god));

Replacement in crawl-ref/source/spells3.cc at line 437 [10.531613]

B:BD[16.2288] → [15.1476:1543]

∅:D[15.1543] → [16.2326:2385]

B:BD[16.2326] → [16.2326:2385]

B:BD[16.2385] → [11.4298:4341]

                      dur, spell,
                      you.pos(),
                      friendly ? you.pet_target : MHITYOU,
                      MG_FORCE_BEH, god));

[16.2288]

[14.626]

                      dur, spell, you.pos(), MHITYOU, MG_FORCE_BEH, god));

Replacement in crawl-ref/source/spells3.cc at line 548 [10.531613]
∅:D[17.897] → [14.2166:2215]
∅:D[18.1056] → [14.2166:2215]
B:BD[14.2166] → [14.2166:2215]
```
                      you.pos(), you.pet_target,
```
[17.897]
[19.167]
```
                      you.pos(), MHITYOU,
```
Replacement in crawl-ref/source/spells3.cc at line 593 [10.531613]
∅:D[15.2753] → [20.1613:1665]
B:BD[20.1613] → [20.1613:1665]
```
                         you.pos(), you.pet_target,
```
[15.2753]
[11.5498]
```
                         you.pos(), MHITYOU,
```
Replacement in crawl-ref/source/spells3.cc at line 607 [10.531613]
∅:D[15.2875] → [20.1930:1982]
B:BD[20.1930] → [20.1930:1982]
```
                         you.pos(), you.pet_target,
```
[15.2875]
[11.5540]
```
                         you.pos(), MHITYOU,
```

Replacement in crawl-ref/source/spells3.cc at line 1001 [10.531613]

B:BD[15.2984] → [15.2984:3041]

                              you.pos(), you.pet_target,

[15.2984]

[11.5997]

                              you.pos(), MHITYOU,

Replacement in crawl-ref/source/spells3.cc at line 1086 [10.531613]

B:BD[15.3095] → [15.3095:3144]

                      you.pos(), you.pet_target,

[15.3095]

[11.6104]

                      you.pos(), MHITYOU,

Replacement in crawl-ref/source/spells3.cc at line 1138 [10.531613]

B:BD[15.3192] → [15.3192:3225]

∅:D[15.3225] → [20.2885:2944]

B:BD[20.2885] → [20.2885:2944]

B:BD[20.2944] → [11.6195:6238]

                      you.pos(),
                      friendly ? you.pet_target : MHITYOU,
                      MG_FORCE_BEH, god));

[15.3192]

[21.633]

                      you.pos(), MHITYOU, MG_FORCE_BEH, god));

Replacement in crawl-ref/source/spells2.cc at line 937 [10.569242]

B:BD[22.1040] → [15.3451:3494]

∅:D[15.3494] → [22.1080:1151]

B:BD[22.1080] → [22.1080:1151]

                          4, 0, you.pos(),
                          friendly ? you.pet_target : MHITYOU)) != -1)

[22.1040]

[22.1151]

                          4, 0, you.pos(), MHITYOU)) != -1)

Replacement in crawl-ref/source/spells2.cc at line 957 [10.569242]

∅:D[15.3606] → [23.462:515]

B:BD[23.462] → [23.462:515]

                          you.pos(), you.pet_target,

[15.3606]

[11.7444]

                          you.pos(), MHITYOU,

Replacement in crawl-ref/source/spells2.cc at line 1017 [10.569242]

∅:D[15.3709] → [24.1762:1815]

B:BD[24.1762] → [24.1762:1815]

                          you.pos(), you.pet_target,

[15.3709]

[11.7542]

                          you.pos(), MHITYOU,

Deletion in crawl-ref/source/spells2.cc at line 1052 [10.569242]
B:BD[25.2442] → [25.2442:2516]
```
    const unsigned short hitting = (friendly) ? you.pet_target : MHITYOU;
```

Replacement in crawl-ref/source/spells2.cc at line 1074 [10.569242]

∅:D[15.3810] → [26.2047:2097]

B:BD[26.2047] → [26.2047:2097]

                              you.pos(), hitting,

[15.3810]

[11.7636]

                              you.pos(), MHITYOU,

Replacement in crawl-ref/source/spells2.cc at line 1122 [10.569242]
∅:D[15.3903] → [26.3809:3855]
B:BD[26.3809] → [26.3809:3855]
```
                          you.pos(), hitting,
```
[15.3903]
[11.7683]
```
                          you.pos(), MHITYOU,
```

Replacement in crawl-ref/source/spells2.cc at line 1162 [10.569242]

B:BD[15.3957] → [15.3957:3994]

∅:D[15.3994] → [27.2927:2990]

B:BD[27.2927] → [27.2927:2990]

                          you.pos(),
                          friendly ? you.pet_target : MHITYOU,

[15.3957]

[11.7777]

                          you.pos(), MHITYOU,

Replacement in crawl-ref/source/spells2.cc at line 1247 [10.569242]
∅:D[15.4100] → [27.5809:5872]
B:BD[27.5809] → [27.5809:5872]
```
                          friendly ? you.pet_target : MHITYOU,
```
[15.4100]
[11.7887]
```
                          MHITYOU,
```
Replacement in crawl-ref/source/spells2.cc at line 1307 [10.569242]
∅:D[15.4189] → [28.1477:1536]
B:BD[28.1477] → [28.1477:1536]
```
                      friendly ? you.pet_target : MHITYOU,
```
[15.4189]
[11.7985]
```
                      MHITYOU,
```
Replacement in crawl-ref/source/spells2.cc at line 1447 [10.569242]
∅:D[15.4269] → [17.1124:1183]
B:BD[17.1124] → [17.1124:1183]
```
                      friendly ? you.pet_target : MHITYOU,
```
[15.4269]
[17.1183]
```
                      MHITYOU,
```
Replacement in crawl-ref/source/spells2.cc at line 1471 [10.569242]
∅:D[15.4362] → [17.1268:1317]
B:BD[17.1268] → [17.1268:1317]
```
                      you.pos(), you.pet_target,
```
[15.4362]
[11.8167]
```
                      you.pos(), MHITYOU,
```
Replacement in crawl-ref/source/spells2.cc at line 1497 [10.569242]
∅:D[15.4448] → [29.991:1050]
B:BD[29.991] → [29.991:1050]
```
                      friendly ? you.pet_target : MHITYOU,
```
[15.4448]
[11.8258]
```
                      MHITYOU,
```
Replacement in crawl-ref/source/spells2.cc at line 1527 [10.569242]
∅:D[15.4528] → [30.266:325]
B:BD[30.266] → [30.266:325]
```
                      friendly ? you.pet_target : MHITYOU,
```
[15.4528]
[11.8345]
```
                      MHITYOU,
```

Replacement in crawl-ref/source/spells2.cc at line 1593 [10.569242]

B:BD[27.6783] → [15.4628:4695]

∅:D[15.4695] → [27.6821:6886]

B:BD[27.6821] → [27.6821:6886]

B:BD[27.6886] → [11.8450:8482]

                      dur, spell,
                      you.pos(),
                      !force_hostile ? you.pet_target : MHITYOU,
                      0, god));

[27.6783]

[31.705]

                      dur, spell, you.pos(), MHITYOU, 0, god));

Replacement in crawl-ref/source/spells2.cc at line 1629 [10.569242]

B:BD[15.4969] → [15.4969:5028]

                      friendly ? you.pet_target : MHITYOU,

[15.4969]

[11.8641]

                      MHITYOU,

Replacement in crawl-ref/source/spells2.cc at line 1722 [10.569242]
∅:D[18.1262] → [32.2090:2153]
∅:D[17.1407] → [32.2090:2153]
B:BD[32.2090] → [32.2090:2153]
```
                          friendly ? you.pet_target : MHITYOU,
```
[17.1407]
[11.8982]
```
                          MHITYOU,
```

Replacement in crawl-ref/source/religion.cc at line 947 [10.804403]

B:BD[4.3130] → [4.3130:3245]

                 0, 0, you.pos(), !force_hostile ? you.pet_target : MHITYOU,
                 0, GOD_YREDELEMNUL);

[4.3130]

[33.2054]

                 0, 0, you.pos(), MHITYOU, 0, GOD_YREDELEMNUL);

Replacement in crawl-ref/source/religion.cc at line 1564 [10.804403]

B:BD[4.4451] → [4.4451:4515]

                      you.pos(), you.pet_target, 0, GOD_BEOGH),

[4.4451]

[4.4515]

                      you.pos(), MHITYOU, 0, GOD_BEOGH),

Replacement in crawl-ref/source/player.cc at line 6541 [10.962854]
B:BD[34.2661] → [34.2661:2706]
```
            pet_target = monster_index(mon);
```
[34.2661]
[35.6945]
```
            pet_target = mon->mindex();
```

Replacement in crawl-ref/source/monstuff.cc at line 1380 [10.1396662]

B:BD[36.3109] → [15.9977:10047]

                                0, 0, monster->pos(), you.pet_target,

[36.3109]

[36.3176]

                                0, 0, monster->pos(), MHITYOU,

Replacement in crawl-ref/source/item_use.cc at line 1813 [10.2781507]
B:BD[37.8647] → [37.8647:8681]
```
        hitting = you.pet_target;
```
[37.8647]
[37.8681]
```
        hitting = MHITYOU;
```

Replacement in crawl-ref/source/item_use.cc at line 4860 [10.2781507]

B:BD[6.3086] → [6.3086:3161]

                                          0, 0, you.pos(), you.pet_target,

[6.3086]

[6.3161]

                                          0, 0, you.pos(), MHITYOU,

Replacement in crawl-ref/source/it_use3.cc at line 230 [10.2870456]

B:BD[38.3181] → [38.3181:3234]

B:BD[38.3234] → [15.10481:10542]

                mgen_data(MONS_SHADOW, BEH_FRIENDLY,
                          2, 0, you.pos(), you.pet_target));

[38.3181]

[39.3350]

                mgen_data(MONS_SHADOW, BEH_FRIENDLY, 2, 0, you.pos(), MHITYOU));

Replacement in crawl-ref/source/it_use3.cc at line 720 [10.2870456]

∅:D[15.10582] → [40.2933:3030]

B:BD[41.2736] → [40.2933:3030]

                      friendly ? you.pet_target : MHITYOU,
                      MG_FORCE_BEH));

[15.10582]

[42.4471]

                      MHITYOU, MG_FORCE_BEH));

Deletion in crawl-ref/source/it_use3.cc at line 987 [10.2870456]
B:BD[43.3442] → [2.2639:2688]
```
        unsigned short hitting = you.pet_target;
```
Deletion in crawl-ref/source/it_use3.cc at line 989 [10.2870456]
B:BD[44.2843] → [44.2843:2853]
```
        {
```
Deletion in crawl-ref/source/it_use3.cc at line 990 [10.2870456]
∅:D[43.3475] → [44.2884:2925]
B:BD[44.2884] → [44.2884:2925]
```
            hitting = MHITYOU;
        }
```

Replacement in crawl-ref/source/it_use3.cc at line 993 [10.2870456]

∅:D[15.10642] → [45.3659:3713]

B:BD[45.3659] → [45.3659:3713]

                          you.pos(), hitting)) != -1)

[15.10642]

[10.2901024]

                          you.pos(), MHITYOU)) != -1)

Replacement in crawl-ref/source/decks.cc at line 2513 [10.3987460]

∅:D[15.10859] → [17.7100:7165]

B:BD[17.7100] → [17.7100:7165]

                              you.pos(), you.pet_target)) != -1)

[15.10859]

[46.1032]

                              you.pos(), MHITYOU)) != -1)

Replacement in crawl-ref/source/decks.cc at line 2697 [10.3987460]
∅:D[15.10906] → [47.2944:2991]
B:BD[47.2944] → [47.2944:2991]
```
                  you.pos(), you.pet_target));
```
[15.10906]
[48.1958]
```
                  you.pos(), MHITYOU));
```
Replacement in crawl-ref/source/decks.cc at line 2751 [10.3987460]
∅:D[15.10962] → [49.2679:2736]
∅:D[50.11115] → [49.2679:2736]
B:BD[47.3131] → [49.2679:2736]
```
                  friendly ? you.pet_target : MHITYOU));
```
[15.10962]
[51.7369]
```
                  MHITYOU));
```

Replacement in crawl-ref/source/decks.cc at line 2763 [10.3987460]

B:BD[47.3286] → [15.10963:11016]

∅:D[15.11016] → [47.3336:3397]

B:BD[47.3336] → [47.3336:3397]

                      power_level + 3, 0, you.pos(),
                      friendly ? you.pet_target : MHITYOU));

[47.3286]

[52.10124]

                      power_level + 3, 0, you.pos(), MHITYOU));

Replacement in crawl-ref/source/decks.cc at line 2835 [10.3987460]

∅:D[17.7216] → [47.3536:3569]

B:BD[47.3536] → [47.3536:3569]

B:BD[47.3569] → [17.7217:7278]

                      you.pos(),
                      friendly ? you.pet_target : MHITYOU));

[17.7216]

[53.62258]

                      you.pos(), MHITYOU));

Replacement in crawl-ref/source/decks.cc at line 2852 [10.3987460]
∅:D[47.3669] → [54.52840:52863]
∅:D[15.11057] → [54.52840:52863]
B:BD[54.52840] → [54.52840:52863]
B:BD[54.52863] → [17.7279:7330]
```
            you.pos(),
            friendly ? you.pet_target : MHITYOU));
```
[15.11057]
[55.2998]
```
            you.pos(), MHITYOU));
```

Replacement in crawl-ref/source/decks.cc at line 2871 [10.3987460]

∅:D[15.11104] → [47.3794:3880]

B:BD[47.3794] → [47.3794:3880]

                  you.pos(),
                  friendly ? you.pet_target : MHITYOU));

[15.11104]

[56.732]

                  you.pos(), MHITYOU));

Replacement in crawl-ref/source/abl-show.cc at line 1379 [10.4494389]

B:BD[10.4516840] → [3.2769:2874]

        animate_dead(&you, you.experience_level * 5, BEH_FRIENDLY,
                     you.pet_target);

[10.4516840]

[10.4516914]

        animate_dead(&you, you.experience_level * 5, BEH_FRIENDLY, MHITYOU);

Replacement in crawl-ref/source/abl-show.cc at line 1553 [10.4494389]

B:BD[7.4246] → [7.4246:4312]

                            you.pet_target, GOD_YREDELEMNUL) < 0)

[7.4246]

[7.4312]

                            MHITYOU, GOD_YREDELEMNUL) < 0)

Replacement in crawl-ref/source/abl-show.cc at line 1569 [10.4494389]

B:BD[57.14277] → [11.15996:16051]

                     you.pet_target, GOD_YREDELEMNUL);

[57.14277]

[10.4522606]

                     MHITYOU, GOD_YREDELEMNUL);

[2070013]: newly created, animated, etc. friendly monsters now default to

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/xom.cc at line 818 [9.3]

Deletion in crawl-ref/source/xom.cc at line 901 [9.3]

Deletion in crawl-ref/source/xom.cc at line 904 [9.3]

Deletion in crawl-ref/source/xom.cc at line 905 [9.3]

Replacement in crawl-ref/source/xom.cc at line 910 [9.3]

Deletion in crawl-ref/source/xom.cc at line 1045 [9.3]

Deletion in crawl-ref/source/xom.cc at line 1048 [9.3]

Deletion in crawl-ref/source/xom.cc at line 1049 [9.3]

Replacement in crawl-ref/source/xom.cc at line 1053 [9.3]

Replacement in crawl-ref/source/spl-cast.cc at line 1609 [10.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 1618 [10.293070]

Replacement in crawl-ref/source/spells3.cc at line 407 [10.531613]

Replacement in crawl-ref/source/spells3.cc at line 437 [10.531613]

Replacement in crawl-ref/source/spells3.cc at line 548 [10.531613]

Replacement in crawl-ref/source/spells3.cc at line 593 [10.531613]

Replacement in crawl-ref/source/spells3.cc at line 607 [10.531613]

Replacement in crawl-ref/source/spells3.cc at line 1001 [10.531613]

Replacement in crawl-ref/source/spells3.cc at line 1086 [10.531613]

Replacement in crawl-ref/source/spells3.cc at line 1138 [10.531613]

Replacement in crawl-ref/source/spells2.cc at line 937 [10.569242]

Replacement in crawl-ref/source/spells2.cc at line 957 [10.569242]

Replacement in crawl-ref/source/spells2.cc at line 1017 [10.569242]

Deletion in crawl-ref/source/spells2.cc at line 1052 [10.569242]

Replacement in crawl-ref/source/spells2.cc at line 1074 [10.569242]

Replacement in crawl-ref/source/spells2.cc at line 1122 [10.569242]

Replacement in crawl-ref/source/spells2.cc at line 1162 [10.569242]

Replacement in crawl-ref/source/spells2.cc at line 1247 [10.569242]

Replacement in crawl-ref/source/spells2.cc at line 1307 [10.569242]

Replacement in crawl-ref/source/spells2.cc at line 1447 [10.569242]

Replacement in crawl-ref/source/spells2.cc at line 1471 [10.569242]

Replacement in crawl-ref/source/spells2.cc at line 1497 [10.569242]

Replacement in crawl-ref/source/spells2.cc at line 1527 [10.569242]

Replacement in crawl-ref/source/spells2.cc at line 1593 [10.569242]

Replacement in crawl-ref/source/spells2.cc at line 1629 [10.569242]

Replacement in crawl-ref/source/spells2.cc at line 1722 [10.569242]

Replacement in crawl-ref/source/religion.cc at line 947 [10.804403]

Replacement in crawl-ref/source/religion.cc at line 1564 [10.804403]

Replacement in crawl-ref/source/player.cc at line 6541 [10.962854]

Replacement in crawl-ref/source/monstuff.cc at line 1380 [10.1396662]

Replacement in crawl-ref/source/item_use.cc at line 1813 [10.2781507]

Replacement in crawl-ref/source/item_use.cc at line 4860 [10.2781507]

Replacement in crawl-ref/source/it_use3.cc at line 230 [10.2870456]

Replacement in crawl-ref/source/it_use3.cc at line 720 [10.2870456]

Deletion in crawl-ref/source/it_use3.cc at line 987 [10.2870456]

Deletion in crawl-ref/source/it_use3.cc at line 989 [10.2870456]

Deletion in crawl-ref/source/it_use3.cc at line 990 [10.2870456]