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

@@ -229,13 +229,9 @@
#define HFlying u.uprops[FLYING].intrinsic
#define EFlying u.uprops[FLYING].extrinsic
#define BFlying u.uprops[FLYING].blocked
#ifdef STEED
# define Flying ((HFlying || EFlying || \
(u.usteed && is_flyer(u.usteed->data))) && \
!BFlying)
#else
# define Flying ((HFlying || EFlying) && !BFlying)
#endif
/* May touch surface; does not override any others */
#define Wwalking (u.uprops[WWALKING].extrinsic && \
@@ -245,12 +241,8 @@
#define HSwimming u.uprops[SWIMMING].intrinsic
#define ESwimming u.uprops[SWIMMING].extrinsic /* [Tom] */
#ifdef STEED
# define Swimming (HSwimming || ESwimming || \
(u.usteed && is_swimmer(u.usteed->data)))
#else
# define Swimming (HSwimming || ESwimming)
#endif
/* Get wet, don't go under water unless if amphibious */
#define HMagical_breathing u.uprops[MAGICAL_BREATHING].intrinsic