M29 - unconscious effects when not unconscious

While auditing nomul() I noticed unconscious() treats (multi < 0 && !nomovemsg)
as unconscious.  This explains the behavior in M29 (unconscious message
while performing #turn).  I checked all the places with this combination,
and found a few that did not appear to fall under the "unconscious" category.
Most I changed to use You_can_move_again to ensure the same display w/o the
unconscious behavior. Also:
- found another string that unconscious() should have considered
- vomit() now sets nomovemsg, one caller was also doing this redundantly
- vomiting_dialogue() was calling stop_occupation() after vomit(), which can
  reset multi.  I reversed the order and removed a doubly-redundant nomul call.

tele() still has a problem: some cases where multi < 0 should probably take
a branch like the unconscious() branch but with a different message.
doturn()'s behavior - turn then wait - is also less than perfect, but I
think this is a known problem.
This commit is contained in:
cohrs
2005-03-25 20:30:24 +00:00
parent bf8a5983ec
commit 2f497c620e
8 changed files with 11 additions and 11 deletions

View File

@@ -2210,7 +2210,7 @@ glovecheck: target = which_armor(mtmp, W_ARMG);
if (mtmp->mhp <= 0) trapkilled = TRUE;
if (unconscious()) {
multi = -1;
nomovemsg="The explosion awakens you!";
nomovemsg = "The explosion awakens you!";
}
break;
@@ -4066,6 +4066,7 @@ unconscious()
{
return((boolean)(multi < 0 && (!nomovemsg ||
u.usleep ||
!strncmp(nomovemsg,"You awake", 9) ||
!strncmp(nomovemsg,"You regain con", 14) ||
!strncmp(nomovemsg,"You are consci", 14))));
}