nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

refine blocked levitation/flight (trunk only)

Browse Source 
Levitation side-effects get skipped if Levitation toggles while it
is blocked, so BFlying (the reason Flying is blocked) could become stale
in some situations.  Enlightment feedback about latent flight capability
was the only thing affected.
This commit is contained in:
nethack.rankin
2011-10-22 23:26:17 +00:00
parent 897d527837
commit 282f8e8e70
6 changed files with 35 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/polyself.c
View File

@@ -88,11 +88,8 @@ set_uasmon()
PROPSET(PASSES_WALLS, passes_walls(mdat));
PROPSET(REGENERATION, regenerates(mdat));
PROPSET(REFLECTING, (mdat == &mons[PM_SILVER_DRAGON]));
/* levitation overrides flight */
if (HLevitation || ELevitation)
BFlying |= I_SPECIAL;
else
BFlying &= ~I_SPECIAL;
float_vs_flight(); /* maybe toggle (BFlying & I_SPECIAL) */
#undef PROPSET
@@ -101,6 +98,18 @@ set_uasmon()
#endif
}
/* Levitation overrides Flying; set or clear BFlying|I_SPECIAL */
void
float_vs_flight()
{
/* floating overrides flight; normally float_up() and float_down()
handle this, but sometimes they're skipped */
if (HLevitation || ELevitation)
BFlying |= I_SPECIAL;
else
BFlying &= ~I_SPECIAL;
}
/* for changing into form that's immune to strangulation */
STATIC_OVL void
check_strangling(on)