fiddlerwoaroof/crawl - Change KKJUHD576DZVDDQ7JFBAO7S35DAPIMZNOYVLAUBDOTTUGR4Q53JQC

Make all the checks for throwable items consistent.

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

Created by dolorous on November 17, 2008

KKJUHD576DZVDDQ7JFBAO7S35DAPIMZNOYVLAUBDOTTUGR4Q53JQC

Dependencies

In channels

main

Change contents

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

B:BD[6.8643] → [7.128:181]

            if ( is_throwable(item, player_size()) )

[6.8643]

[6.8797]

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

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

B:BD[4.100636] → [4.100636:100701]

                if (is_throwable(item, player_size(PSIZE_BODY)))

[4.100636]

[4.100701]

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

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

B:BD[4.100859] → [4.100859:100924]

                if (is_throwable(item, player_size(PSIZE_BODY)))

[4.100859]

[4.100924]

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

Replacement in crawl-ref/source/player.cc at line 2254 [10.962854]
B:BD[9.347077] → [9.347077:347123]
```
size_type player_size( int psize, bool base )
```
[9.347077]
[9.347123]
```
size_type player_size(int psize, bool base)
```

Replacement in crawl-ref/source/itemprop.h at line 686 [9.641567]

B:BD[9.645396] → [9.645396:645662]

B:BD[9.645662] → [11.8587:8633]

B:BD[11.8633] → [12.6871:6923]

∅:D[13.732] → [11.8633:8682]

∅:D[12.6923] → [11.8633:8682]

B:BD[11.8633] → [11.8633:8682]

B:BD[11.8682] → [13.733:797]

bool          is_range_weapon( const item_def &item );
bool          is_range_weapon_type( weapon_type wtype );
missile_type  fires_ammo_type( const item_def &item );
missile_type fires_ammo_type( weapon_type wtype );
const char *  ammo_name( const item_def &bow );
const char *  ammo_name( missile_type mtyp );
bool          has_launcher( const item_def &ammo );
bool          is_throwable( const item_def &wpn,
                            size_type bodysize = SIZE_MEDIUM );

[9.645396]

[11.8747]

bool is_range_weapon(const item_def &item);
bool is_range_weapon_type(weapon_type wtype);
missile_type fires_ammo_type(const item_def &item);
missile_type fires_ammo_type(weapon_type wtype);
const char *ammo_name(missile_type ammo);
const char *ammo_name(const item_def &bow);
bool has_launcher(const item_def &ammo);
bool is_throwable(const item_def &wpn, size_type bodysize = SIZE_MEDIUM,
                  bool force = false);

Replacement in crawl-ref/source/itemprop.cc at line 2013 [9.646661]
B:BD[9.697369] → [9.697369:697422]
```
missile_type fires_ammo_type( const item_def &item )
```
[9.697369]
[9.697422]
```
missile_type fires_ammo_type(const item_def &item)
```

Replacement in crawl-ref/source/itemprop.cc at line 2018 [9.646661]

B:BD[9.697490] → [9.697490:697552]

    return (Weapon_prop[ Weapon_index[item.sub_type] ].ammo);

[9.697490]

[9.697552]

    return (Weapon_prop[Weapon_index[item.sub_type]].ammo);

Replacement in crawl-ref/source/itemprop.cc at line 2021 [9.646661]
B:BD[9.697555] → [9.697555:697605]
```
missile_type fires_ammo_type( weapon_type wtype )
```
[9.697555]
[9.697605]
```
missile_type fires_ammo_type(weapon_type wtype)
```
Replacement in crawl-ref/source/itemprop.cc at line 2025 [9.646661]
B:BD[9.697658] → [12.6925:6952]
```
    wpn.sub_type  = wtype;
```
[9.697658]
[9.697684]
```
    wpn.sub_type = wtype;
```

Replacement in crawl-ref/source/itemprop.cc at line 2030 [9.646661]

B:BD[9.697723] → [9.697723:697819]

B:BD[9.697819] → [11.9337:9340]

B:BD[11.9340] → [14.11227:11273]

∅:D[14.11273] → [11.9385:9451]

B:BD[11.9385] → [11.9385:9451]

B:BD[11.9451] → [14.11274:11325]

bool is_range_weapon( const item_def &item )
{
    return (fires_ammo_type( item ) != MI_NONE);
}
// Decide if something is launched or thrown.
launch_retval is_launched(actor *actor, const item_def *launcher,
                          const item_def &missile)

[9.697723]

[11.9501]

bool is_range_weapon(const item_def &item)

Replacement in crawl-ref/source/itemprop.cc at line 2032 [9.646661]

B:BD[11.9503] → [11.9503:9653]

B:BD[11.9653] → [2.4634:4773]

    if (missile.base_type == OBJ_MISSILES
        && launcher
        && missile.launched_by(*launcher))
    {
        return (LRET_LAUNCHED);
    }
    return (is_throwable(missile, actor->body_size()) ? LRET_THROWN
                                                      : LRET_FUMBLED);

[11.9503]

[9.697819]

    return (fires_ammo_type(item) != MI_NONE);

Replacement in crawl-ref/source/itemprop.cc at line 2035 [9.646661]
B:BD[9.697822] → [9.697822:697869]
```
bool is_range_weapon_type( weapon_type wtype )
```
[9.697822]
[9.697869]
```
bool is_range_weapon_type(weapon_type wtype)
```
Deletion in crawl-ref/source/itemprop.cc at line 2038 [9.646661]
B:BD[9.697889] → [9.697889:697890]
Replacement in crawl-ref/source/itemprop.cc at line 2041 [9.646661]
B:BD[9.697950] → [9.697950:697987]
```
    return (is_range_weapon( wpn ));
```
[9.697950]
[9.697987]
```
    return (is_range_weapon(wpn));
```
Replacement in crawl-ref/source/itemprop.cc at line 2050 [9.646661]
B:BD[11.9910] → [12.6953:6998]
```
const char *ammo_name( const item_def &bow )
```
[11.9910]
[9.698036]
```
const char *ammo_name(const item_def &bow)
```

Replacement in crawl-ref/source/itemprop.cc at line 2052 [9.646661]

B:BD[9.698038] → [9.698038:698076]

B:BD[9.698076] → [11.9911:9957]

    ASSERT( is_range_weapon( bow ) );
    return ammo_name(fires_ammo_type( bow ));

[9.698038]

[13.919]

    ASSERT(is_range_weapon(bow));
    return ammo_name(fires_ammo_type(bow));

Replacement in crawl-ref/source/itemprop.cc at line 2057 [9.646661]
∅:D[14.11378] → [12.6999:7041]
B:BD[13.973] → [12.6999:7041]
```
bool has_launcher( const item_def &ammo )
```
[14.11378]
[13.1014]
```
bool has_launcher(const item_def &ammo)
```
Replacement in crawl-ref/source/itemprop.cc at line 2066 [9.646661]
∅:D[14.11448] → [15.2614:2675]
B:BD[9.698250] → [15.2614:2675]
```
bool is_throwable( const item_def &wpn, size_type bodysize )
```
[14.11448]
[9.698291]
```
bool is_throwable(const item_def &wpn, size_type bodysize, bool force)
```
Replacement in crawl-ref/source/itemprop.cc at line 2072 [9.646661]
B:BD[11.10027] → [5.2754:2789]
```
        if (bodysize < SIZE_MEDIUM
```
[11.10027]
[5.2789]
```
        if (!force && bodysize < SIZE_MEDIUM
```

Insertion in crawl-ref/source/itemprop.cc at line 2082 [9.646661]

[9.698541]

[9.699902]

// Decide if something is launched or thrown.
launch_retval is_launched(actor *actor, const item_def *launcher,
                          const item_def &missile)
{
    if (missile.base_type == OBJ_MISSILES
        && launcher
        && missile.launched_by(*launcher))
    {
        return (LRET_LAUNCHED);
    }
    return (is_throwable(missile, actor->body_size()) ? LRET_THROWN
                                                      : LRET_FUMBLED);
}

Replacement in crawl-ref/source/item_use.cc at line 4852 [10.2781507]
B:BD[4.171342] → [4.171342:171398]
```
        && is_throwable(item, player_size(PSIZE_BODY)))
```
[4.171342]
[16.4470]
```
        && is_throwable(item, you.body_size()))
```
Replacement in crawl-ref/source/externs.h at line 251 [10.3270163]
∅:D[17.6761] → [18.81476:81533]
B:BD[18.81476] → [18.81476:81533]
```
    virtual size_type body_size(int psize = PSIZE_TORSO,
```
[17.6761]
[18.81533]
```
    virtual size_type body_size(int psize = PSIZE_BODY,
```
Replacement in crawl-ref/source/externs.h at line 850 [10.3270163]
∅:D[19.3610] → [18.82914:82989]
∅:D[20.3853] → [18.82914:82989]
B:BD[18.82914] → [18.82914:82989]
```
    size_type body_size(int psize = PSIZE_TORSO, bool base = false) const;
```
[20.3853]
[21.22191]
```
    size_type body_size(int psize = PSIZE_BODY, bool base = false) const;
```
Replacement in crawl-ref/source/externs.h at line 1188 [10.3270163]
∅:D[19.3804] → [18.83725:83800]
∅:D[20.3924] → [18.83725:83800]
B:BD[18.83725] → [18.83725:83800]
```
    size_type body_size(int psize = PSIZE_TORSO, bool base = false) const;
```
[20.3924]
[21.22343]
```
    size_type body_size(int psize = PSIZE_BODY, bool base = false) const;
```

Replacement in crawl-ref/source/describe.cc at line 805 [10.3736416]

B:BD[10.3755592] → [22.7241:7314]

static std::string _describe_weapon( const item_def &item, bool verbose)

[10.3755592]

[10.3755664]

static std::string _describe_weapon(const item_def &item, bool verbose)

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

B:BD[3.2724] → [3.2724:2769]

    bool can_throw     = is_throwable(item);

[3.2724]

[23.7661]

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

Make all the checks for throwable items consistent.

Dependencies

In channels

Change contents

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

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

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

Replacement in crawl-ref/source/player.cc at line 2254 [10.962854]

Replacement in crawl-ref/source/itemprop.h at line 686 [9.641567]

Replacement in crawl-ref/source/itemprop.cc at line 2013 [9.646661]

Replacement in crawl-ref/source/itemprop.cc at line 2018 [9.646661]

Replacement in crawl-ref/source/itemprop.cc at line 2021 [9.646661]

Replacement in crawl-ref/source/itemprop.cc at line 2025 [9.646661]

Replacement in crawl-ref/source/itemprop.cc at line 2030 [9.646661]

Replacement in crawl-ref/source/itemprop.cc at line 2032 [9.646661]

Replacement in crawl-ref/source/itemprop.cc at line 2035 [9.646661]

Deletion in crawl-ref/source/itemprop.cc at line 2038 [9.646661]

Replacement in crawl-ref/source/itemprop.cc at line 2041 [9.646661]

Replacement in crawl-ref/source/itemprop.cc at line 2050 [9.646661]

Replacement in crawl-ref/source/itemprop.cc at line 2052 [9.646661]

Replacement in crawl-ref/source/itemprop.cc at line 2057 [9.646661]

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

Replacement in crawl-ref/source/itemprop.cc at line 2072 [9.646661]

Insertion in crawl-ref/source/itemprop.cc at line 2082 [9.646661]

Replacement in crawl-ref/source/item_use.cc at line 4852 [10.2781507]

Replacement in crawl-ref/source/externs.h at line 251 [10.3270163]

Replacement in crawl-ref/source/externs.h at line 850 [10.3270163]

Replacement in crawl-ref/source/externs.h at line 1188 [10.3270163]

Replacement in crawl-ref/source/describe.cc at line 805 [10.3736416]

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