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

redundant "you finish disrobing" messages

Browse Source 
Just From a bug report:  getting interrupted and then
resuming would sometimes produce two instances of the "You finish" message
(and evidently consumed an extra turn in the process).  I think this is
an old problem and that it's just coincidence that it showed up right after
the patch dealing with avoidance of stale context for 'A'; the interruption
has to occur when there is just one turn left in removing the final item
so doesn't happen very often.
This commit is contained in:
nethack.rankin
2003-11-21 08:08:49 +00:00
parent 29f21b488c
commit 9d042ed2c4
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
doc/fixes34.3
View File

@@ -91,6 +91,7 @@ trapped monster repeatedly switched between ranged and hand-to-hand weapon
silver items such as wands avoided all the silver checks in hmon_hitmon() silver items such as wands avoided all the silver checks in hmon_hitmon()
resuming an interrupted 'A' command could cause crash if pending worn item(s) resuming an interrupted 'A' command could cause crash if pending worn item(s)
were stolen or destroyed were stolen or destroyed
resuming interrupted 'A' sometimes ended with "You finished disrobing" twice
when you're asleep you shouldn't "notice" monsters that have become undetected when you're asleep you shouldn't "notice" monsters that have become undetected
must be able to reach floor in order to use stethoscope on corpse or statue must be able to reach floor in order to use stethoscope on corpse or statue

5
src/do_wear.c
View File

@@ -1914,6 +1914,7 @@ do_takeoff()
return(otmp); return(otmp);
} }
/* occupation callback for 'A' */
STATIC_PTR STATIC_PTR
int int
take_off() take_off()
@@ -2000,6 +2001,7 @@ take_off()
return(1); /* get busy */ return(1); /* get busy */
} }
/* clear saved context to avoid inappropriate resumption of interrupted 'A' */
void void
reset_remarm() reset_remarm()
{ {
@@ -2007,7 +2009,7 @@ reset_remarm()
context.takeoff.disrobing[0] = '\0'; context.takeoff.disrobing[0] = '\0';
} }
/* the 'A' command */ /* the 'A' command -- remove multiple worn items */
int int
doddoremarm() doddoremarm()
{ {
@@ -2016,7 +2018,6 @@ doddoremarm()
if (context.takeoff.what || context.takeoff.mask) { if (context.takeoff.what || context.takeoff.mask) {
You("continue %s.", context.takeoff.disrobing); You("continue %s.", context.takeoff.disrobing);
set_occupation(take_off, context.takeoff.disrobing, 0); set_occupation(take_off, context.takeoff.disrobing, 0);
(void) take_off();
return 0; return 0;
} else if (!uwep && !uswapwep && !uquiver && !uamul && !ublindf && } else if (!uwep && !uswapwep && !uquiver && !uamul && !ublindf &&
!uleft && !uright && !wearing_armor()) { !uleft && !uright && !wearing_armor()) {