diff options
| author | Neil Moore <neil@s-z.org> | 2014-03-22 00:44:25 -0400 |
|---|---|---|
| committer | Neil Moore <neil@s-z.org> | 2014-03-22 00:44:48 -0400 |
| commit | aa30ffd8de87c5afb8ad6b56c77612c99f42ce82 (patch) | |
| tree | b3d4cd75ffb24990cdd1aa5d8cdb813eb6b1c18e /crawl-ref/source/ng-setup.cc | |
| parent | 739405a8a0535ec6fdeedef4fd0592c631cc946a (diff) | |
| download | crawl-ref-aa30ffd8de87c5afb8ad6b56c77612c99f42ce82.tar.gz crawl-ref-aa30ffd8de87c5afb8ad6b56c77612c99f42ce82.zip | |
Don't crash when starting with a shield and no weapon.
Diffstat (limited to 'crawl-ref/source/ng-setup.cc')
| -rw-r--r-- | crawl-ref/source/ng-setup.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/crawl-ref/source/ng-setup.cc b/crawl-ref/source/ng-setup.cc index a2869eb7a3..0af4a8ccf3 100644 --- a/crawl-ref/source/ng-setup.cc +++ b/crawl-ref/source/ng-setup.cc @@ -426,8 +426,11 @@ void newgame_make_item(int slot, equipment_type eqslot, if (item.base_type == OBJ_ARMOUR && !can_wear_armour(item, false, false)) return; - if (is_shield(item) && is_shield_incompatible(*(you.weapon()), &item)) + if (is_shield(item) && you.weapon() + && is_shield_incompatible(*you.weapon(), &item)) + { return; + } if (eqslot == EQ_WEAPON && !can_wield(&item, false, false)) return; |