diff options
| author | Adam Borowski <kilobyte@angband.pl> | 2009-11-25 13:25:28 +0100 |
|---|---|---|
| committer | Adam Borowski <kilobyte@angband.pl> | 2009-11-25 14:03:09 +0100 |
| commit | 9a1056ab7e0feb88bb8bcf84411441de3dc32ba6 (patch) | |
| tree | 09684d6636e1b977ead8a3cf3523383886b7eaab /crawl-ref/source/mapdef.cc | |
| parent | 763bb56f6a247c444123ed3dc5acdfeca1ab2852 (diff) | |
| download | crawl-ref-9a1056ab7e0feb88bb8bcf84411441de3dc32ba6.tar.gz crawl-ref-9a1056ab7e0feb88bb8bcf84411441de3dc32ba6.zip | |
Be more nazi about illegal brands (like, reaping on melee weapons like scythes).
Diffstat (limited to 'crawl-ref/source/mapdef.cc')
| -rw-r--r-- | crawl-ref/source/mapdef.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/crawl-ref/source/mapdef.cc b/crawl-ref/source/mapdef.cc index d791318c40..93310d481c 100644 --- a/crawl-ref/source/mapdef.cc +++ b/crawl-ref/source/mapdef.cc @@ -3410,8 +3410,9 @@ item_spec item_list::parse_single_spec(std::string s) else if (result.base_type == OBJ_WEAPONS && !is_weapon_brand_ok(result.sub_type, ego) || result.base_type == OBJ_ARMOUR - && !is_armour_brand_ok(result.sub_type, ego)) - // no missile brands are disallowed yet + && !is_armour_brand_ok(result.sub_type, ego) + || result.base_type == OBJ_MISSILES + && !is_missile_brand_ok(result.sub_type, ego)) { error = make_stringf("Ego '%s' is incompatible with item '%s'.", ego_str.c_str(), s.c_str()); |