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

gameover

Browse Source 
The recent bones panic included "program initialization failed"
during final rundown.  The cause of the panic has already been fixed;
this fixes the silly message that was delivered with it.

     Also, disclose the contents of carried statues along with normal
containers when the game ends.
This commit is contained in:
nethack.rankin
2003-03-10 23:43:28 +00:00
parent 7350d4fc98
commit 9327d35592
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
doc/fixes34.2
+3
View File
@@ -10,6 +10,9 @@ if only one monster in a monster-vs-monster fight is visible, show an I symbol
for the other one whether it is an attacker or defender for the other one whether it is an attacker or defender
display "It" and not "The invisible <pet>" when an invisible pet eats food. display "It" and not "The invisible <pet>" when an invisible pet eats food.
include a hint about expected input when prompting for musical notes include a hint about expected input when prompting for musical notes
don't report "program initialization failed" if a panic occurs after the
game is over
include statue contents in end of game inventory disclosure
Platform- and/or Interface-Specific Fixes Platform- and/or Interface-Specific Fixes
src/end.c
+8 -4
View File
@@ -1,4 +1,4 @@
/* SCCS Id: @(#)end.c 3.4 2003/01/08 */ /* SCCS Id: @(#)end.c 3.4 2003/03/10 */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/* NetHack may be freely redistributed. See license for details. */ /* NetHack may be freely redistributed. See license for details. */
@@ -264,7 +264,9 @@ panic VA_DECL(const char *, str)
iflags.window_inited = 0; /* they're gone; force raw_print()ing */ iflags.window_inited = 0; /* they're gone; force raw_print()ing */
} }
raw_print(!program_state.something_worth_saving ? raw_print(program_state.gameover ?
"Postgame wrapup disrupted." :
!program_state.something_worth_saving ?
"Program initialization has failed." : "Program initialization has failed." :
"Suddenly, the dungeon collapses."); "Suddenly, the dungeon collapses.");
#if defined(WIZARD) && !defined(MICRO) #if defined(WIZARD) && !defined(MICRO)
@@ -919,8 +921,10 @@ boolean identified, all_containers;
char buf[BUFSZ]; char buf[BUFSZ];
for (box = list; box; box = box->nobj) { for (box = list; box; box = box->nobj) {
if (Is_container(box) && box->otyp != BAG_OF_TRICKS) { if (Is_container(box) || box->otyp == STATUE) {
if (box->cobj) { if (box->otyp == BAG_OF_TRICKS) {
continue; /* wrong type of container */
} else if (box->cobj) {
winid tmpwin = create_nhwindow(NHW_MENU); winid tmpwin = create_nhwindow(NHW_MENU);
Sprintf(buf, "Contents of %s:", the(xname(box))); Sprintf(buf, "Contents of %s:", the(xname(box)));
putstr(tmpwin, 0, buf); putstr(tmpwin, 0, buf);