diff options
| author | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-07-02 19:43:22 +0000 |
|---|---|---|
| committer | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-07-02 19:43:22 +0000 |
| commit | cbe35862e2fbe0d52d50d99a33b80448e87962de (patch) | |
| tree | afb865df53c1f49b0f4c0c78d3fb52712641da76 /crawl-ref/source | |
| parent | a065b3c3384ff85750be7126ffbb3f2df5f2d375 (diff) | |
| download | crawl-ref-cbe35862e2fbe0d52d50d99a33b80448e87962de.tar.gz crawl-ref-cbe35862e2fbe0d52d50d99a33b80448e87962de.zip | |
[1746555] Fixed lingering instances of spell_type(x).
Orcs no longer get blowguns.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@1718 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source')
| -rw-r--r-- | crawl-ref/source/makeitem.cc | 7 | ||||
| -rw-r--r-- | crawl-ref/source/spl-cast.cc | 6 |
2 files changed, 3 insertions, 10 deletions
diff --git a/crawl-ref/source/makeitem.cc b/crawl-ref/source/makeitem.cc index 997b0b90f1..48338df8e4 100644 --- a/crawl-ref/source/makeitem.cc +++ b/crawl-ref/source/makeitem.cc @@ -3131,13 +3131,6 @@ static item_make_species_type give_weapon(monsters *mon, int level) break; case MONS_ORC: - if (one_chance_in(15) && level > 1) - { - item.base_type = OBJ_WEAPONS; - item.sub_type = WPN_BLOWGUN; - break; - } - // deliberate fall through {gdl} case MONS_ORC_PRIEST: item_race = MAKE_ITEM_ORCISH; // deliberate fall through {gdl} diff --git a/crawl-ref/source/spl-cast.cc b/crawl-ref/source/spl-cast.cc index a80124ebc5..e6dfd60263 100644 --- a/crawl-ref/source/spl-cast.cc +++ b/crawl-ref/source/spl-cast.cc @@ -56,9 +56,9 @@ #define WILD_MAGIC_NASTINESS 150 -static bool surge_identify_boosters(int spell) +static bool surge_identify_boosters(spell_type spell) { - const unsigned int typeflags = spell_type(spell); + const unsigned int typeflags = get_spell_disciplines(spell); if ( (typeflags & SPTYP_FIRE) || (typeflags & SPTYP_ICE) ) { // Must not be wielding an unIDed staff. @@ -1843,7 +1843,7 @@ void exercise_spell( spell_type spell, bool spc, bool success ) // set at 50 in stone_soup 0.1.1 (which is bad). const int ref_skill = 80; - unsigned int disciplines = spell_type(spell); + unsigned int disciplines = get_spell_disciplines(spell); //jmf: evil evil evil -- exclude HOLY bit disciplines &= (~SPTYP_HOLY); |