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

extra control characters in panic messages

Browse Source 
I noticed a few panic messages contained newlines, and one included a naked
carriage return.  panic() adds a newline itself, and also generally ensures
the message will be on a new line (the initial "oops" ensures the message
itself will be on a new lines).  This patch removes the unneeded characters.
This commit is contained in:
cohrs
2003-10-23 01:30:05 +00:00
parent cc5bea4fbf
commit cc52b2f533
4 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/questpgr.c
View File

@@ -60,7 +60,7 @@ dlb *stream;
if ((cnt = dlb_fread(ptr, size, nitems, stream)) != nitems) { if ((cnt = dlb_fread(ptr, size, nitems, stream)) != nitems) {
panic("PREMATURE EOF ON QUEST TEXT FILE!\nExpected %d bytes - got %d\n", panic("PREMATURE EOF ON QUEST TEXT FILE! Expected %d bytes, got %d",
(size * nitems), (size * cnt)); (size * nitems), (size * cnt));
} }
} }
@@ -96,7 +96,7 @@ load_qtlist()
msg_file = dlb_fopen(QTEXT_FILE, RDBMODE); msg_file = dlb_fopen(QTEXT_FILE, RDBMODE);
if (!msg_file) if (!msg_file)
panic("\rCANNOT OPEN QUEST TEXT FILE %s.", QTEXT_FILE); panic("CANNOT OPEN QUEST TEXT FILE %s.", QTEXT_FILE);
/* /*
* Read in the number of classes, then the ID's & offsets for * Read in the number of classes, then the ID's & offsets for

8
win/X11/winX.c
View File

@@ -688,7 +688,7 @@ X11_create_nhwindow(type)
create_text_window(wp); create_text_window(wp);
break; break;
default: default:
panic("create_nhwindow: unknown type [%d]\n", type); panic("create_nhwindow: unknown type [%d]", type);
break; break;
} }
return window; return window;
@@ -712,7 +712,7 @@ X11_clear_nhwindow(window)
/* do nothing for these window types */ /* do nothing for these window types */
break; break;
default: default:
panic("clear_nhwindow: unknown window type [%d]\n", wp->type); panic("clear_nhwindow: unknown window type [%d]", wp->type);
break; break;
} }
} }
@@ -775,7 +775,7 @@ X11_display_nhwindow(window, blocking)
display_text_window(wp, blocking); /* pop up text window */ display_text_window(wp, blocking); /* pop up text window */
break; break;
default: default:
panic("display_nhwindow: unknown window type [%d]\n", wp->type); panic("display_nhwindow: unknown window type [%d]", wp->type);
break; break;
} }
} }
@@ -899,7 +899,7 @@ void X11_outrip(window, how)
if (wp->type == NHW_TEXT) { if (wp->type == NHW_TEXT) {
wp->text_information->is_rip = TRUE; wp->text_information->is_rip = TRUE;
} else { } else {
panic("ripout on non-text window (window type [%d])\n", wp->type); panic("ripout on non-text window (window type [%d])", wp->type);
} }
calculate_rip_text(how); calculate_rip_text(how);

2
win/X11/winmap.c
View File

@@ -1654,7 +1654,7 @@ x_event(exit_condition)
} }
break; break;
default: default:
panic("x_event: unknown exit condition %d\n", exit_condition); panic("x_event: unknown exit condition %d", exit_condition);
break; break;
} }
} while (keep_going); } while (keep_going);

8
win/X11/winmisc.c
View File

@@ -327,7 +327,7 @@ X11_player_selection()
} else if (ps_selected == PS_RANDOM) { } else if (ps_selected == PS_RANDOM) {
flags.initrole = ROLE_RANDOM; flags.initrole = ROLE_RANDOM;
} else if (ps_selected < 0 || ps_selected >= num_roles) { } else if (ps_selected < 0 || ps_selected >= num_roles) {
panic("player_selection: bad role select value %d\n", ps_selected); panic("player_selection: bad role select value %d", ps_selected);
} else { } else {
flags.initrole = ps_selected; flags.initrole = ps_selected;
} }
@@ -392,7 +392,7 @@ X11_player_selection()
} else if (ps_selected == PS_RANDOM) { } else if (ps_selected == PS_RANDOM) {
flags.initrace = ROLE_RANDOM; flags.initrace = ROLE_RANDOM;
} else if (ps_selected < 0 || ps_selected >= num_races) { } else if (ps_selected < 0 || ps_selected >= num_races) {
panic("player_selection: bad race select value %d\n", ps_selected); panic("player_selection: bad race select value %d", ps_selected);
} else { } else {
flags.initrace = ps_selected; flags.initrace = ps_selected;
} }
@@ -457,7 +457,7 @@ X11_player_selection()
} else if (ps_selected == PS_RANDOM) { } else if (ps_selected == PS_RANDOM) {
flags.initgend = ROLE_RANDOM; flags.initgend = ROLE_RANDOM;
} else if (ps_selected < 0 || ps_selected >= num_gends) { } else if (ps_selected < 0 || ps_selected >= num_gends) {
panic("player_selection: bad gender select value %d\n", ps_selected); panic("player_selection: bad gender select value %d", ps_selected);
} else { } else {
flags.initgend = ps_selected; flags.initgend = ps_selected;
} }
@@ -521,7 +521,7 @@ X11_player_selection()
} else if (ps_selected == PS_RANDOM) { } else if (ps_selected == PS_RANDOM) {
flags.initalign = ROLE_RANDOM; flags.initalign = ROLE_RANDOM;
} else if (ps_selected < 0 || ps_selected >= num_algns) { } else if (ps_selected < 0 || ps_selected >= num_algns) {
panic("player_selection: bad alignment select value %d\n", ps_selected); panic("player_selection: bad alignment select value %d", ps_selected);
} else { } else {
flags.initalign = ps_selected; flags.initalign = ps_selected;
} }