Make STEED unconditional.
This commit is contained in:
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user