fiddlerwoaroof/crawl - Change LRNJ7O6FCNZ6TWEEQLXB6ZTKSDJNZ6HXV6T6RFVW5VU6E73MX4AQC

Fixed order-of-operations bug which was causing items with subtype 23

(e.g. ?oHolyWord) being considered evil. [apparently introduced in r6601?] Fixes 2121183.

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

Created by haranp on September 21, 2008

LRNJ7O6FCNZ6TWEEQLXB6ZTKSDJNZ6HXV6T6RFVW5VU6E73MX4AQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/religion.cc at line 3033 [5.804403]

B:BD[4.2631] → [2.2573:2757]

        if ((item.base_type == OBJ_POTIONS && item.sub_type == POT_MUTATION
                || item.base_type == OBJ_WANDS
                   && item.sub_type == WAND_POLYMORPH_OTHER)

[4.2631]

[6.2534]

        if (((item.base_type == OBJ_POTIONS && item.sub_type == POT_MUTATION)
             || (item.base_type == OBJ_WANDS
                 && item.sub_type == WAND_POLYMORPH_OTHER))

Replacement in crawl-ref/source/religion.cc at line 3064 [5.804403]

B:BD[7.3252] → [2.2868:2960]

∅:D[8.2808] → [7.3395:3409]

∅:D[2.2960] → [7.3395:3409]

B:BD[7.3395] → [7.3395:3409]

            if (item_brand == SPMSL_POISONED
                || item_brand == SPMSL_CURARE)
            {

[7.3252]

[7.3409]

            if (item_brand == SPMSL_POISONED || item_brand == SPMSL_CURARE)

Deletion in crawl-ref/source/religion.cc at line 3066 [5.804403]
B:BD[7.3440] → [7.3440:3454]
```
            }
```

Replacement in crawl-ref/source/religion.cc at line 3068 [5.804403]

B:BD[3.2683] → [3.2683:2761]

            && item.sub_type == STAFF_POISON || item.sub_type == STAFF_VENOM)

[3.2683]

[3.2761]

                 && (item.sub_type == STAFF_POISON
                     || item.sub_type == STAFF_VENOM))