Make STEED unconditional.

This commit is contained in:
Sean Hunt
2015-02-13 21:23:56 -05:00
committed by Pasi Kallinen
parent aba6ecb7b3
commit 9759f5bf6d
62 changed files with 98 additions and 641 deletions

View File

@@ -1687,10 +1687,7 @@ long *abil;
long wornbits;
long wornmask = (W_ARM | W_ARMC | W_ARMH | W_ARMS | W_ARMG | W_ARMF |
W_WEP | W_QUIVER | W_SWAPWEP | W_ART | W_ARTI | W_AMUL |
W_RINGL | W_RINGR | W_TOOL | W_BALL | W_CHAIN
#ifdef STEED
| W_SADDLE
#endif
W_RINGL | W_RINGR | W_TOOL | W_BALL | W_CHAIN | W_SADDLE
#ifdef TOURIST
| W_ARMU
#endif
@@ -1868,7 +1865,6 @@ int dropflag; /* 0==don't drop, 1==drop all, 2==drop weapon */
/* check primary weapon next so that they're handled together */
if (uwep) (void)untouchable(uwep, dropit);
#ifdef STEED
/* in case someone is daft enough to add artifact or silver saddle */
if (u.usteed && (obj = which_armor(u.usteed, W_SADDLE)) != 0) {
/* untouchable() calls retouch_object() which expects an object in
@@ -1876,7 +1872,6 @@ int dropflag; /* 0==don't drop, 1==drop all, 2==drop weapon */
saddle and we're suppressing drop, so this works as intended */
if (untouchable(obj, FALSE)) dismount_steed(DISMOUNT_THROWN);
}
#endif
/*
* TODO? Force off gloves if either or both rings are going to
* become unworn; force off cloak [suit] before suit [shirt].