fiddlerwoaroof/crawl - Change OJKUO2UJ2O2MUITGVQNF3BQITGVYE3XK6QTG7XW6OYPJ4YFWCFQQC

Use the proper flag type to indicate god gifts (oops).

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

Created by dolorous on June 9, 2008

OJKUO2UJ2O2MUITGVQNF3BQITGVYE3XK6QTG7XW6OYPJ4YFWCFQQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/xom.cc at line 502 [10.3]

B:BD[9.56] → [9.56:128]

                              you.pos(), you.pet_target, MF_GOD_GIFT));

[9.56]

[11.36]

                              you.pos(), you.pet_target, MG_GOD_GIFT));

Replacement in crawl-ref/source/xom.cc at line 591 [10.3]

B:BD[12.317] → [9.168:235]

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

[12.317]

[10.15329]

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

Replacement in crawl-ref/source/xom.cc at line 687 [10.3]

B:BD[9.379] → [9.379:446]

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

[9.379]

[10.18034]

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

Replacement in crawl-ref/source/xom.cc at line 864 [10.3]

B:BD[9.501] → [9.501:580]

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

[9.501]

[13.399]

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

Replacement in crawl-ref/source/spells3.cc at line 428 [15.531613]

B:BD[14.1352] → [14.1352:1410]

                      god_gift ? MF_GOD_GIFT : 0)) != -1)

[14.1352]

[14.1410]

                      god_gift ? MG_GOD_GIFT : 0)) != -1)

Replacement in crawl-ref/source/spells3.cc at line 458 [15.531613]

B:BD[14.2385] → [14.2385:2443]

                      god_gift ? MF_GOD_GIFT : 0)) != -1)

[14.2385]

[14.2443]

                      god_gift ? MG_GOD_GIFT : 0)) != -1)

Replacement in crawl-ref/source/spells3.cc at line 550 [15.531613]

B:BD[16.797] → [16.797:855]

                      god_gift ? MF_GOD_GIFT : 0)) != -1)

[16.797]

[16.855]

                      god_gift ? MG_GOD_GIFT : 0)) != -1)

Replacement in crawl-ref/source/spells3.cc at line 570 [15.531613]

B:BD[5.581] → [5.581:638]

                     god_gift ? MF_GOD_GIFT : 0)) != -1)

[5.581]

[5.638]

                     god_gift ? MG_GOD_GIFT : 0)) != -1)

Replacement in crawl-ref/source/spells3.cc at line 614 [15.531613]

B:BD[17.1665] → [17.1665:1726]

                         god_gift ? MF_GOD_GIFT : 0)) != -1)

[17.1665]

[17.1726]

                         god_gift ? MG_GOD_GIFT : 0)) != -1)

Replacement in crawl-ref/source/spells3.cc at line 627 [15.531613]

B:BD[17.1982] → [17.1982:2043]

                         god_gift ? MF_GOD_GIFT : 0)) != -1)

[17.1982]

[17.2043]

                         god_gift ? MG_GOD_GIFT : 0)) != -1)

Replacement in crawl-ref/source/spells3.cc at line 839 [15.531613]

B:BD[6.7407] → [6.7407:7459]

                        god_gift ? MF_GOD_GIFT : 0,

[6.7407]

[6.7459]

                        god_gift ? MG_GOD_GIFT : 0,

Replacement in crawl-ref/source/spells3.cc at line 1044 [15.531613]

B:BD[18.1251] → [18.1251:1309]

                              god_gift ? MF_GOD_GIFT : 0,

[18.1251]

[18.1309]

                              god_gift ? MG_GOD_GIFT : 0,

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

B:BD[4.2436] → [4.2436:2486]

                      god_gift ? MF_GOD_GIFT : 0,

[4.2436]

[4.2486]

                      god_gift ? MG_GOD_GIFT : 0,

Replacement in crawl-ref/source/spells3.cc at line 1188 [15.531613]

B:BD[17.2944] → [17.2944:3002]

                      god_gift ? MF_GOD_GIFT : 0)) != -1)

[17.2944]

[19.1011]

                      god_gift ? MG_GOD_GIFT : 0)) != -1)

Replacement in crawl-ref/source/spells2.cc at line 1029 [15.569242]

B:BD[2.515] → [2.515:577]

                          god_gift ? MF_GOD_GIFT : 0)) != -1)

[2.515]

[2.577]

                          god_gift ? MG_GOD_GIFT : 0)) != -1)

Replacement in crawl-ref/source/spells2.cc at line 1085 [15.569242]

B:BD[20.1815] → [20.1815:1877]

                          god_gift ? MF_GOD_GIFT : 0)) != -1)

[20.1815]

[20.1877]

                          god_gift ? MG_GOD_GIFT : 0)) != -1)

Replacement in crawl-ref/source/spells2.cc at line 1151 [15.569242]

B:BD[3.2097] → [3.2097:2163]

                              god_gift ? MF_GOD_GIFT : 0)) != -1)

[3.2097]

[3.2163]

                              god_gift ? MG_GOD_GIFT : 0)) != -1)

Replacement in crawl-ref/source/spells2.cc at line 1197 [15.569242]

B:BD[3.3855] → [3.3855:3917]

                          god_gift ? MF_GOD_GIFT : 0)) != -1)

[3.3855]

[3.3917]

                          god_gift ? MG_GOD_GIFT : 0)) != -1)

Replacement in crawl-ref/source/spells2.cc at line 1236 [15.569242]

B:BD[21.2990] → [21.2990:3052]

                          god_gift ? MF_GOD_GIFT : 0)) != -1)

[21.2990]

[21.3052]

                          god_gift ? MG_GOD_GIFT : 0)) != -1)

Replacement in crawl-ref/source/spells2.cc at line 1320 [15.569242]

B:BD[21.5872] → [21.5872:5934]

                          god_gift ? MF_GOD_GIFT : 0)) != -1)

[21.5872]

[21.5934]

                          god_gift ? MG_GOD_GIFT : 0)) != -1)

Replacement in crawl-ref/source/spells2.cc at line 1385 [15.569242]

B:BD[22.1536] → [22.1536:1594]

                      god_gift ? MF_GOD_GIFT : 0)) != -1)

[22.1536]

[22.1594]

                      god_gift ? MG_GOD_GIFT : 0)) != -1)

Replacement in crawl-ref/source/spells2.cc at line 1530 [15.569242]

B:BD[7.228] → [7.228:286]

                      god_gift ? MF_GOD_GIFT : 0)) != -1)

[7.228]

[23.5029]

                      god_gift ? MG_GOD_GIFT : 0)) != -1)

Replacement in crawl-ref/source/spells2.cc at line 1555 [15.569242]

∅:D[22.1911] → [24.1392:1450]

B:BD[24.1392] → [24.1392:1450]

                      god_gift ? MF_GOD_GIFT : 0)) != -1)

[22.1911]

[24.1450]

                      god_gift ? MG_GOD_GIFT : 0)) != -1)

Replacement in crawl-ref/source/spells2.cc at line 1584 [15.569242]

B:BD[25.1050] → [25.1050:1108]

                      god_gift ? MF_GOD_GIFT : 0)) != -1)

[25.1050]

[25.1108]

                      god_gift ? MG_GOD_GIFT : 0)) != -1)

Replacement in crawl-ref/source/spells2.cc at line 1614 [15.569242]

B:BD[26.325] → [26.325:383]

                      god_gift ? MF_GOD_GIFT : 0)) != -1)

[26.325]

[15.605286]

                      god_gift ? MG_GOD_GIFT : 0)) != -1)

Replacement in crawl-ref/source/spells2.cc at line 1659 [15.569242]

B:BD[27.1363] → [27.1363:1419]

                          god_gift ? MF_GOD_GIFT : 0));

[27.1363]

[27.1419]

                          god_gift ? MG_GOD_GIFT : 0));

Replacement in crawl-ref/source/spells2.cc at line 1714 [15.569242]

B:BD[28.1921] → [28.1921:1977]

                          god_gift ? MF_GOD_GIFT : 0));

[28.1921]

[28.1977]

                          god_gift ? MG_GOD_GIFT : 0));

Replacement in crawl-ref/source/spells2.cc at line 1816 [15.569242]

B:BD[21.6886] → [29.754:806]

                      god_gift ? MF_GOD_GIFT : 0));

[21.6886]

[30.705]

                      god_gift ? MG_GOD_GIFT : 0));

Replacement in crawl-ref/source/spells2.cc at line 1856 [15.569242]

B:BD[29.1279] → [29.1279:1341]

                                god_gift ? MF_GOD_GIFT : 0));

[29.1279]

[31.1419]

                                god_gift ? MG_GOD_GIFT : 0));

Replacement in crawl-ref/source/religion.cc at line 1111 [15.804403]

B:BD[9.9031] → [9.9031:9099]

                          you.pos(), you.pet_target, MF_GOD_GIFT));

[9.9031]

[9.9099]

                          you.pos(), you.pet_target, MG_GOD_GIFT));

Replacement in crawl-ref/source/religion.cc at line 1546 [15.804403]

B:BD[9.9288] → [9.9288:9343]

                                  MF_GOD_GIFT)) != -1)

[9.9288]

[15.816477]

                                  MG_GOD_GIFT)) != -1)

Replacement in crawl-ref/source/religion.cc at line 3021 [15.804403]

B:BD[29.4187] → [29.4187:4243]

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

[29.4187]

[32.2594]

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

Replacement in crawl-ref/source/religion.cc at line 3122 [15.804403]

B:BD[29.4344] → [29.4344:4404]

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

[29.4344]

[33.2952]

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

Replacement in crawl-ref/source/religion.cc at line 3286 [15.804403]

B:BD[29.4626] → [29.4626:4690]

                               you.pos(), MF_GOD_GIFT)) != -1);

[29.4626]

[9.10409]

                               you.pos(), MG_GOD_GIFT)) != -1);

Replacement in crawl-ref/source/religion.cc at line 3304 [15.804403]

B:BD[29.4876] → [29.4876:4931]

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

[29.4876]

[9.10997]

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

Replacement in crawl-ref/source/religion.cc at line 3332 [15.804403]

B:BD[29.5025] → [29.5025:5081]

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

[29.5025]

[9.11455]

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

Replacement in crawl-ref/source/religion.cc at line 3371 [15.804403]

B:BD[9.11553] → [9.11553:11609]

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

[9.11553]

[9.11609]

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

Replacement in crawl-ref/source/religion.cc at line 3536 [15.804403]

B:BD[9.12003] → [9.12003:12053]

                        you.pos(), MF_GOD_GIFT));

[9.12003]

[34.3237]

                        you.pos(), MG_GOD_GIFT));

Replacement in crawl-ref/source/religion.cc at line 3591 [15.804403]

B:BD[9.12115] → [9.12115:12185]

                           you.pos(), MF_GOD_GIFT, MG_PERMIT_BANDS));

[9.12115]

[15.869564]

                           you.pos(), MG_GOD_GIFT | MG_PERMIT_BANDS));

Replacement in crawl-ref/source/religion.cc at line 3621 [15.804403]

B:BD[9.12240] → [9.12240:12292]

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

[9.12240]

[35.8021]

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

Replacement in crawl-ref/source/religion.cc at line 3714 [15.804403]

B:BD[29.5303] → [29.5303:5367]

                               you.pos(), MF_GOD_GIFT)) != -1);

[29.5303]

[36.2583]

                               you.pos(), MG_GOD_GIFT)) != -1);

Replacement in crawl-ref/source/religion.cc at line 3732 [15.804403]

B:BD[29.5553] → [29.5553:5608]

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

[29.5553]

[15.873686]

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

Replacement in crawl-ref/source/mstuff2.cc at line 514 [15.1340842]

B:BD[8.3002] → [8.3002:3072]

    const unsigned flags = mons_is_priest(monster) ? MF_GOD_GIFT : 0;

[8.3002]

[8.3072]

    const unsigned flags = mons_is_priest(monster) ? MG_GOD_GIFT : 0;

Replacement in crawl-ref/source/monstuff.cc at line 1013 [15.1396662]

B:BD[37.16710] → [38.2864:2927]

                                   god_gift ? MF_GOD_GIFT : 0,

[37.16710]

[38.2927]

                                   god_gift ? MG_GOD_GIFT : 0,

Replacement in crawl-ref/source/monplace.h at line 104 [15.1638277]

B:BD[37.17403] → [39.10872:11011]

    MG_PERMIT_BANDS = 0x01,
    MG_FORCE_PLACE  = 0x02,
    MG_FORCE_BEH    = 0x04,
    MG_PLAYER_MADE  = 0x08,
    MG_PATROLLING   = 0x10

[37.17403]

[37.17510]

    MG_GOD_GIFT     = 0x01,
    MG_PERMIT_BANDS = 0x02,
    MG_FORCE_PLACE  = 0x04,
    MG_FORCE_BEH    = 0x08,
    MG_PLAYER_MADE  = 0x10,
    MG_PATROLLING   = 0x20

Insertion in crawl-ref/source/monplace.cc at line 1877 [15.1641732]
[15.1674021]
[9.12794]
```
    if (mg.flags & MG_GOD_GIFT)
        creation->flags |= MF_GOD_GIFT;
```