fiddlerwoaroof/crawl - Change 7EIA4DGVDBJRNHEAN3DK6SNHGALSSEUWSOL57C2VPGN2IZCQ633AC

Clean up handling of thrown items (mostly large rocks) again.

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

Created by dolorous on November 17, 2008

7EIA4DGVDBJRNHEAN3DK6SNHGALSSEUWSOL57C2VPGN2IZCQ633AC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/tutorial.cc at line 3026 [8.5936]
∅:D[6.1191] → [7.7117:7184]
∅:D[9.6093] → [7.7117:7184]
B:BD[7.7117] → [7.7117:7184]
```
            if (is_throwable(item, you.body_size()) && !long_text)
```
[6.1191]
[7.7184]
```
            if (is_throwable(&you, item) && !long_text)
```
Replacement in crawl-ref/source/tutorial.cc at line 3051 [8.5936]
∅:D[10.4883] → [7.8303:8372]
∅:D[9.6140] → [7.8303:8372]
B:BD[7.8303] → [7.8303:8372]
```
                if (!wielded && is_throwable(item, you.body_size()))
```
[9.6140]
[7.8372]
```
                if (!wielded && is_throwable(&you, item))
```

Replacement in crawl-ref/source/tutorial.cc at line 3060 [8.5936]

B:BD[7.8643] → [5.226:279]

            if (is_throwable(item, you.body_size()))

[7.8643]

[7.8797]

            if (is_throwable(&you, item))

Replacement in crawl-ref/source/tilereg.cc at line 1558 [11.54399]

B:BD[11.100636] → [5.293:350]

                if (is_throwable(item, you.body_size()))

[11.100636]

[11.100701]

                if (is_throwable(&you, item))

Replacement in crawl-ref/source/tilereg.cc at line 1563 [11.54399]

B:BD[11.100859] → [5.351:408]

                if (is_throwable(item, you.body_size()))

[11.100859]

[11.100924]

                if (is_throwable(&you, item))

Replacement in crawl-ref/source/quiver.cc at line 536 [12.3828]

B:BD[12.10648] → [12.10648:10744]

    else if (item.base_type == OBJ_WEAPONS
             && is_throwable(item, you.body_size()))

[12.10648]

[12.10744]

    else if (item.base_type == OBJ_WEAPONS && is_throwable(&you, item))

Replacement in crawl-ref/source/player.cc at line 6868 [14.962854]
B:BD[13.184] → [13.184:221]
```
bool player::can_throw_rocks() const
```
[13.184]
[13.221]
```
bool player::can_throw_large_rocks() const
```

Replacement in crawl-ref/source/player.cc at line 6870 [14.962854]

B:BD[13.223] → [3.4078:4134]

    return (species == SP_OGRE || species == SP_TROLL);

[13.223]

[15.639]

    return (player_genus(GENPC_OGRE) || species == SP_TROLL);

Insertion in crawl-ref/source/monstuff.h at line 202 [14.1390580]

[16.1165]

int mons_missile_damage(monsters *mons, const item_def *launch,
                        const item_def *missile);

Deletion in crawl-ref/source/monstuff.h at line 206 [14.1390580]

B:BD[16.1284] → [16.1284:1382]

int mons_missile_damage(const item_def *launch,
                        const item_def *missile);

Insertion in crawl-ref/source/monstuff.cc at line 5421 [14.1396662]

[16.1720]

}
int mons_weapon_damage_rating(const item_def &launcher)
{
    return (property(launcher, PWPN_DAMAGE) + launcher.plus2);

Replacement in crawl-ref/source/monstuff.cc at line 5429 [14.1396662]
B:BD[16.1791] → [16.1791:1839]
```
int mons_missile_damage(const item_def *launch,
```
[16.1791]
[16.1839]
```
int mons_missile_damage(monsters *mons, const item_def *launch,
```

Replacement in crawl-ref/source/monstuff.cc at line 5432 [14.1396662]

B:BD[16.1890] → [16.1890:1948]

    if (!missile || (!launch && !is_throwable(*missile)))

[16.1890]

[16.1948]

    if (!missile || (!launch && !is_throwable(mons, *missile)))

Deletion in crawl-ref/source/monstuff.cc at line 5438 [14.1396662]

B:BD[16.2172] → [16.2172:2296]

}
int mons_weapon_damage_rating(const item_def &launcher)
{
    return (property(launcher, PWPN_DAMAGE) + launcher.plus2);

Replacement in crawl-ref/source/monstuff.cc at line 5468 [14.1396662]

B:BD[16.3318] → [16.3318:3378]

    const int fdam = mons_missile_damage(launch, missiles);

[16.3318]

[16.3378]

    const int fdam = mons_missile_damage(mons, launch, missiles);

Replacement in crawl-ref/source/mon-util.cc at line 3516 [14.1699344]
B:BD[17.11813] → [16.4914:4953]
```
bool monsters::can_throw_rocks() const
```
[17.11813]
[16.4953]
```
bool monsters::can_throw_large_rocks() const
```
Deletion in crawl-ref/source/mon-util.cc at line 3550 [14.1699344]
B:BD[18.673] → [19.11647:11648]
∅:D[19.11648] → [16.5293:5369]
B:BD[16.5293] → [16.5293:5369]
```
    if (item.base_type == OBJ_WEAPONS)
        return (is_throwable(item));
```

Replacement in crawl-ref/source/mon-util.cc at line 3551 [14.1699344]

B:BD[16.5370] → [16.5370:5410]

B:BD[16.5410] → [20.1284:1309]

B:BD[20.1309] → [4.2475:2597]

    if (item.base_type != OBJ_MISSILES)
        return (false);
    if ((item.sub_type == MI_THROWING_NET || item.sub_type == MI_JAVELIN)
        && body_size(PSIZE_BODY) < SIZE_MEDIUM)

[16.5370]

[4.2597]

    if (item.base_type == OBJ_WEAPONS
        || item.base_type == OBJ_MISSILES && !has_launcher(item))

Replacement in crawl-ref/source/mon-util.cc at line 3554 [14.1699344]
∅:D[20.1390] → [16.5410:5434]
∅:D[4.2603] → [16.5410:5434]
B:BD[16.5410] → [16.5410:5434]
```
        return (false);
```
[4.2603]
[4.2604]
```
        return (is_throwable(this, item));
```

Deletion in crawl-ref/source/mon-util.cc at line 3557 [14.1699344]

B:BD[16.5435] → [16.5435:5522]

B:BD[16.5522] → [4.2611:2885]

∅:D[4.2885] → [21.3277:3300]

B:BD[21.3277] → [21.3277:3300]

B:BD[21.3300] → [4.2886:2892]

∅:D[4.2892] → [21.3300:3301]

B:BD[21.3300] → [21.3300:3301]

    if (item.sub_type == MI_LARGE_ROCK && !can_throw_rocks())
        return (false);
    // Stones and darts don't need any launcher, and are always okay.
    // Other missile types that don't need any launcher should be okay
    // if we've gotten this far.
    if (item.sub_type == MI_STONE || item.sub_type == MI_DART
        || !has_launcher(item))
    {
        return (true);
    }

Replacement in crawl-ref/source/mon-util.cc at line 4041 [14.1699344]

B:BD[16.12021] → [22.4078:4155]

        || (_q_adj_damage(mons_missile_damage(launch, &mitm[exist_missile]),

[16.12021]

[16.12097]

        || (_q_adj_damage(mons_missile_damage(this, launch,
                                              &mitm[exist_missile]),

Replacement in crawl-ref/source/itemprop.h at line 693 [23.641567]

B:BD[5.3066] → [5.3066:3178]

∅:D[24.797] → [25.8747:8864]

∅:D[5.3178] → [25.8747:8864]

B:BD[25.8747] → [25.8747:8864]

bool is_throwable(const item_def &wpn, size_type bodysize = SIZE_MEDIUM,
                  bool force = false);
launch_retval is_launched(actor *actor, const item_def *launcher,
                         const item_def &missile);

[5.3066]

[23.645797]

bool is_throwable(const actor *actor, const item_def &wpn, bool force = false);
launch_retval is_launched(const actor *actor, const item_def *launcher,
                          const item_def &missile);

Replacement in crawl-ref/source/itemprop.cc at line 2066 [23.646661]

B:BD[26.11448] → [5.3707:3778]

bool is_throwable(const item_def &wpn, size_type bodysize, bool force)

[26.11448]

[23.698291]

bool is_throwable(const actor *actor, const item_def &wpn, bool force)

Insertion in crawl-ref/source/itemprop.cc at line 2068 [23.646661]
[23.698293]
[23.698293]
```
    size_type bodysize = actor->body_size();
```

Replacement in crawl-ref/source/itemprop.cc at line 2071 [23.646661]

B:BD[23.698331] → [23.698331:698401]

        return (Weapon_prop[ Weapon_index[wpn.sub_type] ].throwable);

[23.698331]

[23.698401]

        return (Weapon_prop[Weapon_index[wpn.sub_type]].throwable);

Replacement in crawl-ref/source/itemprop.cc at line 2074 [23.646661]
B:BD[25.10027] → [5.3779:3824]
∅:D[5.3824] → [27.2789:2869]
B:BD[27.2789] → [27.2789:2869]
```
        if (!force && bodysize < SIZE_MEDIUM
            && (wpn.sub_type == MI_JAVELIN || wpn.sub_type == MI_THROWING_NET))
```
[25.10027]
[27.2869]
```
        if (!force)
```

Replacement in crawl-ref/source/itemprop.cc at line 2076 [23.646661]

∅:D[27.2879] → [28.24365:24393]

B:BD[28.24365] → [28.24365:24393]

            return (false);

[27.2879]

[27.2880]

            if ((bodysize < SIZE_LARGE
                    || !actor->can_throw_large_rocks())
                && wpn.sub_type == MI_LARGE_ROCK)
            {
                return (false);
            }
            if (bodysize < SIZE_MEDIUM
                && (wpn.sub_type == MI_JAVELIN
                    || wpn.sub_type == MI_THROWING_NET))
            {
                return (false);
            }

Replacement in crawl-ref/source/itemprop.cc at line 2090 [23.646661]
∅:D[27.2890] → [23.698445:698517]
∅:D[25.10121] → [23.698445:698517]
∅:D[28.24393] → [23.698445:698517]
B:BD[23.698445] → [23.698445:698517]
```
        return (Missile_prop[ Missile_index[wpn.sub_type] ].throwable);
```
[27.2890]
[25.10122]
```
        return (Missile_prop[Missile_index[wpn.sub_type]].throwable);
```
Insertion in crawl-ref/source/itemprop.cc at line 2093 [23.646661]
[25.10128]
[23.698518]

Replacement in crawl-ref/source/itemprop.cc at line 2098 [23.646661]

B:BD[5.3871] → [5.3871:3937]

launch_retval is_launched(actor *actor, const item_def *launcher,

[5.3871]

[5.3937]

launch_retval is_launched(const actor *actor, const item_def *launcher,

Replacement in crawl-ref/source/itemprop.cc at line 2108 [23.646661]

B:BD[5.4140] → [5.4140:4279]

    return (is_throwable(missile, actor->body_size()) ? LRET_THROWN
                                                      : LRET_FUMBLED);

[5.4140]

[5.4279]

    return (is_throwable(actor, missile) ? LRET_THROWN : LRET_FUMBLED);

Replacement in crawl-ref/source/item_use.cc at line 1850 [14.2781507]
∅:D[2.8695] → [29.3831:3870]
B:BD[29.3831] → [29.3831:3870]
```
            if (you.can_throw_rocks())
```
[2.8695]
[29.4026]
```
            if (you.can_throw_large_rocks())
```

Replacement in crawl-ref/source/item_use.cc at line 2345 [14.2781507]

B:BD[13.1086] → [13.1086:1129]

                if (you.can_throw_rocks())

[13.1086]

[13.1129]

                if (you.can_throw_large_rocks())

Replacement in crawl-ref/source/item_use.cc at line 4851 [14.2781507]

B:BD[11.171304] → [11.171304:171342]

B:BD[11.171342] → [5.4287:4335]

    if (item.base_type == OBJ_WEAPONS
        && is_throwable(item, you.body_size()))

[11.171304]

[30.4470]

    if (item.base_type == OBJ_WEAPONS && is_throwable(&you, item))

Insertion in crawl-ref/source/externs.h at line 334 [14.3270163]
[17.85234]
[17.85234]
```
    virtual bool can_throw_large_rocks() const = 0;
```
Replacement in crawl-ref/source/externs.h at line 941 [14.3270163]
B:BD[13.1596] → [13.1596:1630]
```
    bool can_throw_rocks() const;
```
[13.1596]
[15.2786]
```
    bool can_throw_large_rocks() const;
```
Insertion in crawl-ref/source/externs.h at line 1291 [14.3270163]
[31.3039]
[17.89072]
```
    bool can_throw_large_rocks() const;
```
Deletion in crawl-ref/source/externs.h at line 1353 [14.3270163]
∅:D[32.1549] → [16.23225:23259]
B:BD[16.23225] → [16.23225:23259]
```
    bool can_throw_rocks() const;
```

Replacement in crawl-ref/source/describe.cc at line 1145 [14.3736416]

B:BD[33.2724] → [5.4648:4716]

    bool can_throw     = is_throwable(item, you.body_size(), true);

[33.2724]

[34.7661]

    bool can_throw     = is_throwable(&you, item, true);

Clean up handling of thrown items (mostly large rocks) again.

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/tutorial.cc at line 3026 [8.5936]

Replacement in crawl-ref/source/tutorial.cc at line 3051 [8.5936]

Replacement in crawl-ref/source/tutorial.cc at line 3060 [8.5936]

Replacement in crawl-ref/source/tilereg.cc at line 1558 [11.54399]

Replacement in crawl-ref/source/tilereg.cc at line 1563 [11.54399]

Replacement in crawl-ref/source/quiver.cc at line 536 [12.3828]

Replacement in crawl-ref/source/player.cc at line 6868 [14.962854]

Replacement in crawl-ref/source/player.cc at line 6870 [14.962854]

Insertion in crawl-ref/source/monstuff.h at line 202 [14.1390580]

Deletion in crawl-ref/source/monstuff.h at line 206 [14.1390580]

Insertion in crawl-ref/source/monstuff.cc at line 5421 [14.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 5429 [14.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 5432 [14.1396662]

Deletion in crawl-ref/source/monstuff.cc at line 5438 [14.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 5468 [14.1396662]

Replacement in crawl-ref/source/mon-util.cc at line 3516 [14.1699344]

Deletion in crawl-ref/source/mon-util.cc at line 3550 [14.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 3551 [14.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 3554 [14.1699344]

Deletion in crawl-ref/source/mon-util.cc at line 3557 [14.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 4041 [14.1699344]

Replacement in crawl-ref/source/itemprop.h at line 693 [23.641567]

Replacement in crawl-ref/source/itemprop.cc at line 2066 [23.646661]

Insertion in crawl-ref/source/itemprop.cc at line 2068 [23.646661]

Replacement in crawl-ref/source/itemprop.cc at line 2071 [23.646661]

Replacement in crawl-ref/source/itemprop.cc at line 2074 [23.646661]

Replacement in crawl-ref/source/itemprop.cc at line 2076 [23.646661]

Replacement in crawl-ref/source/itemprop.cc at line 2090 [23.646661]

Insertion in crawl-ref/source/itemprop.cc at line 2093 [23.646661]

Replacement in crawl-ref/source/itemprop.cc at line 2098 [23.646661]

Replacement in crawl-ref/source/itemprop.cc at line 2108 [23.646661]

Replacement in crawl-ref/source/item_use.cc at line 1850 [14.2781507]

Replacement in crawl-ref/source/item_use.cc at line 2345 [14.2781507]

Replacement in crawl-ref/source/item_use.cc at line 4851 [14.2781507]

Insertion in crawl-ref/source/externs.h at line 334 [14.3270163]

Replacement in crawl-ref/source/externs.h at line 941 [14.3270163]

Insertion in crawl-ref/source/externs.h at line 1291 [14.3270163]

Deletion in crawl-ref/source/externs.h at line 1353 [14.3270163]

Replacement in crawl-ref/source/describe.cc at line 1145 [14.3736416]