fiddlerwoaroof/crawl - Change L4P7CLMZ46XNYJLUCGI2GBEQ7DUXRUTDQ5DIWJBLK4SQZBP5W74AC

Fix 2033055: only prompt for unsuitable weapons if you can see the target.

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

Created by haranp on July 30, 2008

L4P7CLMZ46XNYJLUCGI2GBEQ7DUXRUTDQ5DIWJBLK4SQZBP5W74AC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/religion.cc at line 4941 [7.804403]

B:BD[5.193360] → [6.11227:11292]

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

[5.193360]

[5.193419]

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

Replacement in crawl-ref/source/religion.cc at line 4943 [7.804403]
B:BD[5.193421] → [5.193421:193470]
```
    const int wpn = get_player_wielded_weapon();
```
[5.193421]
[5.193470]
```
    item_def& weap = *you.weapon();
```
Replacement in crawl-ref/source/religion.cc at line 4946 [7.804403]
∅:D[8.2628] → [9.2527:2597]
B:BD[5.193471] → [9.2527:2597]
```
    if (!is_artefact(you.inv[wpn]) && !is_range_weapon(you.inv[wpn]))
```
[8.2628]
[5.193694]
```
    if (!is_artefact(weap) && !is_range_weapon(weap))
```

Replacement in crawl-ref/source/religion.cc at line 4950 [7.804403]

B:BD[5.193765] → [5.193765:193922]

        set_equip_desc( you.inv[wpn], ISFLAG_GLOWING );
        set_item_ego_type( you.inv[wpn], OBJ_WEAPONS, brand );
        you.inv[wpn].colour = colour;

[5.193765]

[7.879476]

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

Replacement in crawl-ref/source/religion.cc at line 4954 [7.804403]
B:BD[7.879477] → [5.193923:193964]
```
        do_uncurse_item( you.inv[wpn] );
```
[7.879477]
[2.2528]
```
        do_uncurse_item( weap );
```
Replacement in crawl-ref/source/religion.cc at line 4956 [7.804403]
∅:D[2.2529] → [10.4059:4121]
B:BD[5.193964] → [10.4059:4121]
```
        enchant_weapon( ENCHANT_TO_HIT, true, you.inv[wpn] );
```
[2.2529]
[3.2528]
```
        enchant_weapon( ENCHANT_TO_HIT, true, weap );
```

Replacement in crawl-ref/source/religion.cc at line 4959 [7.804403]

B:BD[3.2553] → [3.2553:2619]

            enchant_weapon( ENCHANT_TO_HIT, true, you.inv[wpn] );

[3.2553]

[3.2619]

            enchant_weapon( ENCHANT_TO_HIT, true, weap );

Replacement in crawl-ref/source/religion.cc at line 4961 [7.804403]
∅:D[3.2620] → [10.4121:4183]
B:BD[10.4121] → [10.4121:4183]
```
        enchant_weapon( ENCHANT_TO_DAM, true, you.inv[wpn] );
```
[3.2620]
[7.879477]
```
        enchant_weapon( ENCHANT_TO_DAM, true, weap );
```

Replacement in crawl-ref/source/religion.cc at line 4964 [7.804403]

B:BD[3.2645] → [3.2645:2711]

            enchant_weapon( ENCHANT_TO_DAM, true, you.inv[wpn] );

[3.2645]

[3.2711]

            enchant_weapon( ENCHANT_TO_DAM, true, weap );

Replacement in crawl-ref/source/religion.cc at line 4968 [7.804403]
B:BD[11.2533] → [12.2558:2598]
```
            convert2good(you.inv[wpn]);
```
[11.2533]
[13.2686]
```
            convert2good(weap);
```
Replacement in crawl-ref/source/religion.cc at line 4970 [7.804403]
B:BD[13.2687] → [12.2599:2645]
```
            if (is_convertible(you.inv[wpn]))
```
[13.2687]
[14.2523]
```
            if (is_convertible(weap))
```

Replacement in crawl-ref/source/religion.cc at line 4972 [7.804403]

B:BD[14.2537] → [14.2537:2601]

B:BD[14.2601] → [15.2565:2620]

                origin_acquired(you.inv[wpn], GOD_SHINING_ONE);
                make_item_blessed_blade(you.inv[wpn]);

[14.2537]

[14.2602]

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

Replacement in crawl-ref/source/religion.cc at line 4994 [7.804403]

B:BD[8.2677] → [16.2888:2930]

∅:D[16.2930] → [17.9349:9395]

B:BD[17.9349] → [17.9349:9395]

∅:D[17.9395] → [18.3715:3733]

B:BD[18.3715] → [18.3715:3733]

B:BD[18.3733] → [4.17233:17403]

∅:D[4.17403] → [18.3883:3901]

B:BD[18.3883] → [18.3883:3901]

            for (int i = -3; i <= 3; ++i)
                for (int j = -3; j <= 3; j++)
                {
                    coord_def tmp = you.pos() + coord_def(i,j);
                    if (is_bloodcovered(tmp))
                        env.map(tmp).property = FPROP_NONE;
                }

[8.2677]

[18.3901]

            for ( radius_iterator ri(you.pos(), 3, true, true); ri; ++ri )
                if (is_bloodcovered(*ri))
                    env.map(*ri).property = FPROP_NONE;

Replacement in crawl-ref/source/fight.cc at line 4109 [7.3140790]

B:BD[19.4404] → [20.7590:7634]

    if (!wielded_weapon_check(attk.weapon))

[19.4404]

[20.7634]

    if (you.can_see(defender) && !wielded_weapon_check(attk.weapon))

Fix 2033055: only prompt for unsuitable weapons if you can see the target.

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/religion.cc at line 4941 [7.804403]

Replacement in crawl-ref/source/religion.cc at line 4943 [7.804403]

Replacement in crawl-ref/source/religion.cc at line 4946 [7.804403]

Replacement in crawl-ref/source/religion.cc at line 4950 [7.804403]

Replacement in crawl-ref/source/religion.cc at line 4954 [7.804403]

Replacement in crawl-ref/source/religion.cc at line 4956 [7.804403]

Replacement in crawl-ref/source/religion.cc at line 4959 [7.804403]

Replacement in crawl-ref/source/religion.cc at line 4961 [7.804403]

Replacement in crawl-ref/source/religion.cc at line 4964 [7.804403]

Replacement in crawl-ref/source/religion.cc at line 4968 [7.804403]

Replacement in crawl-ref/source/religion.cc at line 4970 [7.804403]

Replacement in crawl-ref/source/religion.cc at line 4972 [7.804403]

Replacement in crawl-ref/source/religion.cc at line 4994 [7.804403]

Replacement in crawl-ref/source/fight.cc at line 4109 [7.3140790]