fiddlerwoaroof/crawl - Change FL5OQVX5UXHYHPKC2YZ3PSD4QQ6OHRYXBIVSSKR4RIPUJNC3TORAC

Add miscellaneous minor fixes.

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

Created by dolorous on March 2, 2009

FL5OQVX5UXHYHPKC2YZ3PSD4QQ6OHRYXBIVSSKR4RIPUJNC3TORAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/spells3.cc at line 139 [4.531613]

B:BD[4.535444] → [5.1512:1566]

            do_uncurse_item( you.inv[you.equip[i]] );

[4.535444]

[4.535502]

            do_uncurse_item(you.inv[you.equip[i]]);

Replacement in crawl-ref/source/religion.cc at line 6012 [4.804403]

B:BD[6.193360] → [7.2637:2709]

static bool _bless_weapon( god_type god, brand_type brand, int colour )

[6.193360]

[6.193419]

static bool _bless_weapon(god_type god, brand_type brand, int colour)

Replacement in crawl-ref/source/religion.cc at line 6014 [4.804403]
B:BD[6.193421] → [7.2710:2746]
```
    item_def& weap = *you.weapon();
```
[6.193421]
[6.193470]
```
    item_def& wpn = *you.weapon();
```
Replacement in crawl-ref/source/religion.cc at line 6017 [4.804403]
B:BD[8.2628] → [7.2747:2801]
```
    if (!is_artefact(weap) && !is_range_weapon(weap))
```
[8.2628]
[6.193694]
```
    if (!is_artefact(wpn) && !is_range_weapon(wpn))
```

Replacement in crawl-ref/source/religion.cc at line 6021 [4.804403]

B:BD[6.193765] → [7.2802:2935]

        set_equip_desc( weap, ISFLAG_GLOWING );
        set_item_ego_type( weap, OBJ_WEAPONS, brand );
        weap.colour = colour;

[6.193765]

[4.879476]

        set_equip_desc(wpn, ISFLAG_GLOWING);
        set_item_ego_type(wpn, OBJ_WEAPONS, brand);
        wpn.colour = colour;

Replacement in crawl-ref/source/religion.cc at line 6025 [4.804403]
B:BD[4.879477] → [7.2936:2969]
```
        do_uncurse_item( weap );
```
[4.879477]
[9.2528]
```
        const bool is_cursed = item_cursed(wpn);
```

Replacement in crawl-ref/source/religion.cc at line 6027 [4.804403]

B:BD[9.2529] → [7.2970:3024]

        enchant_weapon( ENCHANT_TO_HIT, true, weap );

[9.2529]

[10.2528]

        enchant_weapon(ENCHANT_TO_HIT, true, wpn);

Replacement in crawl-ref/source/religion.cc at line 6030 [4.804403]

B:BD[10.2553] → [7.3025:3083]

            enchant_weapon( ENCHANT_TO_HIT, true, weap );

[10.2553]

[10.2619]

            enchant_weapon(ENCHANT_TO_HIT, true, wpn);

Replacement in crawl-ref/source/religion.cc at line 6032 [4.804403]

B:BD[10.2620] → [7.3084:3138]

        enchant_weapon( ENCHANT_TO_DAM, true, weap );

[10.2620]

[4.879477]

        enchant_weapon(ENCHANT_TO_DAM, true, wpn);

Replacement in crawl-ref/source/religion.cc at line 6035 [4.804403]

B:BD[10.2645] → [7.3139:3197]

            enchant_weapon( ENCHANT_TO_DAM, true, weap );

[10.2645]

[10.2711]

            enchant_weapon(ENCHANT_TO_DAM, true, wpn);
        if (is_cursed)
            do_uncurse_item(wpn);

Replacement in crawl-ref/source/religion.cc at line 6040 [4.804403]
∅:D[10.2712] → [11.2523:2561]
B:BD[4.879478] → [11.2523:2561]
```
        if ( god == GOD_SHINING_ONE )
```
[10.2712]
[12.2523]
```
        if (god == GOD_SHINING_ONE)
```
Replacement in crawl-ref/source/religion.cc at line 6042 [4.804403]
B:BD[12.2533] → [7.3198:3230]
```
            convert2good(weap);
```
[12.2533]
[13.2686]
```
            convert2good(wpn);
```

Replacement in crawl-ref/source/religion.cc at line 6044 [4.804403]

B:BD[13.2687] → [2.2705:2757]

            if (is_blessed_blade_convertible(weap))

[13.2687]

[14.2523]

            if (is_blessed_blade_convertible(wpn))

Replacement in crawl-ref/source/religion.cc at line 6046 [4.804403]

B:BD[14.2537] → [7.3270:3373]

                origin_acquired(weap, GOD_SHINING_ONE);
                make_item_blessed_blade(weap);

[14.2537]

[14.2602]

                origin_acquired(wpn, GOD_SHINING_ONE);
                make_item_blessed_blade(wpn);

Replacement in crawl-ref/source/religion.cc at line 6060 [4.804403]

B:BD[6.194243] → [6.194243:194365]

        mprf( MSGCH_GOD, "Your weapon shines brightly!" );
        simple_god_message( " booms: Use this gift wisely!" );

[6.194243]

[6.194365]

        mprf(MSGCH_GOD, "Your weapon shines brightly!");
        simple_god_message(" booms: Use this gift wisely!");

Replacement in crawl-ref/source/religion.cc at line 6063 [4.804403]
B:BD[6.194366] → [11.2612:2650]
```
        if ( god == GOD_SHINING_ONE )
```
[6.194366]
[15.3581]
```
        if (god == GOD_SHINING_ONE)
```
Replacement in crawl-ref/source/item_use.cc at line 4397 [4.2781507]
B:BD[4.2853257] → [16.6127:6163]
```
            do_uncurse_item( wpn );
```
[4.2853257]
[4.2853257]
```
            do_uncurse_item(wpn);
```
Replacement in crawl-ref/source/item_use.cc at line 4441 [4.2781507]
B:BD[16.6694] → [16.6694:6726]
```
        do_uncurse_item( wpn );
```
[16.6694]
[4.2854435]
```
        do_uncurse_item(wpn);
```
Replacement in crawl-ref/source/item_use.cc at line 4499 [4.2781507]
B:BD[17.5843] → [17.5843:5879]
```
            do_uncurse_item( arm );
```
[17.5843]
[4.2856002]
```
            do_uncurse_item(arm);
```
Replacement in crawl-ref/source/item_use.cc at line 4517 [4.2781507]
∅:D[18.4524] → [17.6167:6203]
B:BD[17.6167] → [17.6167:6203]
```
            do_uncurse_item( arm );
```
[18.4523]
[4.2856856]
```
            do_uncurse_item(arm);
```

Replacement in crawl-ref/source/item_use.cc at line 4524 [4.2781507]

B:BD[19.2852] → [19.2852:2903]

                canned_msg( MSG_NOTHING_HAPPENS );

[19.2852]

[16.7177]

                canned_msg(MSG_NOTHING_HAPPENS);

Replacement in crawl-ref/source/item_use.cc at line 4541 [4.2781507]
B:BD[17.6352] → [17.6352:6384]
```
        do_uncurse_item( arm );
```
[17.6352]
[18.4664]
```
        do_uncurse_item(arm);
```

Replacement in crawl-ref/source/item_use.cc at line 4948 [4.2781507]

B:BD[4.2864291] → [20.3150:3216]

        id_the_scroll = _handle_enchant_weapon( ENCHANT_TO_HIT );

[4.2864291]

[4.2864349]

        id_the_scroll = _handle_enchant_weapon(ENCHANT_TO_HIT);

Replacement in crawl-ref/source/item_use.cc at line 4952 [4.2781507]

B:BD[4.2864397] → [20.3217:3283]

        id_the_scroll = _handle_enchant_weapon( ENCHANT_TO_DAM );

[4.2864397]

[4.2864455]

        id_the_scroll = _handle_enchant_weapon(ENCHANT_TO_DAM);

Replacement in crawl-ref/source/item_use.cc at line 4969 [4.2781507]

∅:D[21.4659] → [20.3284:3348]

B:BD[16.7404] → [20.3284:3348]

                _handle_enchant_weapon( ENCHANT_TO_HIT, true );

[4.2864831]

[4.2864887]

                _handle_enchant_weapon(ENCHANT_TO_HIT, true);

Replacement in crawl-ref/source/item_use.cc at line 4972 [4.2781507]

B:BD[3.3055] → [3.3055:3123]

                    _handle_enchant_weapon( ENCHANT_TO_HIT, true );

[3.3055]

[4.2864980]

                    _handle_enchant_weapon(ENCHANT_TO_HIT, true);

Replacement in crawl-ref/source/item_use.cc at line 4974 [4.2781507]

∅:D[21.4749] → [20.3418:3482]

B:BD[4.2864981] → [20.3418:3482]

                _handle_enchant_weapon( ENCHANT_TO_DAM, true );

[4.2864981]

[3.3124]

                _handle_enchant_weapon(ENCHANT_TO_DAM, true);

Replacement in crawl-ref/source/item_use.cc at line 4977 [4.2781507]

B:BD[3.3157] → [3.3157:3225]

                    _handle_enchant_weapon( ENCHANT_TO_DAM, true );

[3.3157]

[3.3225]

                    _handle_enchant_weapon(ENCHANT_TO_DAM, true);
                if (is_cursed)
                    do_uncurse_item(wpn);

Replacement in crawl-ref/source/item_use.cc at line 4987 [4.2781507]

B:BD[3.3433] → [3.3433:3497]

                _handle_enchant_weapon( ENCHANT_TO_HIT, true );

[3.3433]

[3.3497]

                _handle_enchant_weapon(ENCHANT_TO_HIT, true);

Replacement in crawl-ref/source/item_use.cc at line 4990 [4.2781507]

B:BD[3.3530] → [3.3530:3598]

                    _handle_enchant_weapon( ENCHANT_TO_HIT, true );

[3.3530]

[3.3598]

                    _handle_enchant_weapon(ENCHANT_TO_HIT, true);
                if (is_cursed)
                    do_uncurse_item(wpn);

Deletion in crawl-ref/source/item_use.cc at line 4995 [4.2781507]

B:BD[3.3612] → [3.3612:3680]


            if (is_cursed)
                do_uncurse_item( wpn );

Add miscellaneous minor fixes.

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/spells3.cc at line 139 [4.531613]

Replacement in crawl-ref/source/religion.cc at line 6012 [4.804403]

Replacement in crawl-ref/source/religion.cc at line 6014 [4.804403]

Replacement in crawl-ref/source/religion.cc at line 6017 [4.804403]

Replacement in crawl-ref/source/religion.cc at line 6021 [4.804403]

Replacement in crawl-ref/source/religion.cc at line 6025 [4.804403]

Replacement in crawl-ref/source/religion.cc at line 6027 [4.804403]

Replacement in crawl-ref/source/religion.cc at line 6030 [4.804403]

Replacement in crawl-ref/source/religion.cc at line 6032 [4.804403]

Replacement in crawl-ref/source/religion.cc at line 6035 [4.804403]

Replacement in crawl-ref/source/religion.cc at line 6040 [4.804403]

Replacement in crawl-ref/source/religion.cc at line 6042 [4.804403]

Replacement in crawl-ref/source/religion.cc at line 6044 [4.804403]

Replacement in crawl-ref/source/religion.cc at line 6046 [4.804403]

Replacement in crawl-ref/source/religion.cc at line 6060 [4.804403]

Replacement in crawl-ref/source/religion.cc at line 6063 [4.804403]

Replacement in crawl-ref/source/item_use.cc at line 4397 [4.2781507]

Replacement in crawl-ref/source/item_use.cc at line 4441 [4.2781507]

Replacement in crawl-ref/source/item_use.cc at line 4499 [4.2781507]

Replacement in crawl-ref/source/item_use.cc at line 4517 [4.2781507]