U260 - waiting times out for no reason while in were form

The initial report thought this was related to summoning help.  It's not.
moveloop would attempt to call you_were() even when you_were() would not
actually change your form.  Certainly there's a layering problem here, but
for now, just put in the same check peffects() uses to avoid calling
you_were() unnecessarily.
This commit is contained in:
cohrs
2003-02-12 02:07:22 +00:00
parent fe05bcf52d
commit b48b6addf3
2 changed files with 3 additions and 1 deletions

View File

@@ -381,6 +381,7 @@ applying figurines to an adjacent spot over water does drowning checks
fix sequencing of Magicbane's hit messages fix sequencing of Magicbane's hit messages
avoid buffer overflow from long or too many -s params avoid buffer overflow from long or too many -s params
wake up first if trying to crawl out of water while asleep wake up first if trying to crawl out of water while asleep
while waiting, don't try to change into were form when already in were form
Platform- and/or Interface-Specific Fixes Platform- and/or Interface-Specific Fixes

View File

@@ -240,7 +240,8 @@ moveloop()
change = 0; change = 0;
if(Polymorph && !rn2(100)) if(Polymorph && !rn2(100))
change = 1; change = 1;
else if (u.ulycn >= LOW_PM && !rn2(80 - (20 * night()))) else if (u.ulycn >= LOW_PM && !Upolyd &&
!rn2(80 - (20 * night())))
change = 2; change = 2;
if (change && !Unchanging) { if (change && !Unchanging) {
if (multi >= 0) { if (multi >= 0) {