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

Merge branch 'NetHack-3.6.2'

Browse Source
This commit is contained in:
nhmall
2019-02-07 20:06:22 -05:00
parent 6cf233f6b5 8a8f39d2b5
commit c2d3fb816a
6 changed files with 95 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
win/curses/cursmisc.c
View File

@@ -220,12 +220,12 @@ curses_copy_of(const char *s)
{
if (!s)
s = "";
return strcpy((char *) alloc((unsigned) (strlen(s) + 1)), s);
return dupstr(s);
}
/* Determine the number of lines needed for a string for a dialog window
of the given width */
of the given width */
int
curses_num_lines(const char *str, int width)
@@ -588,7 +588,7 @@ curses_view_file(const char *filename, boolean must_exist)
wid = curses_get_wid(NHW_MENU);
curses_create_nhmenu(wid);
identifier = malloc(sizeof (anything));
identifier = (anything *) alloc(sizeof (anything));
identifier->a_void = NULL;
while (dlb_fgets(buf, BUFSZ, fp) != NULL) {
@@ -632,7 +632,7 @@ curses_get_count(int first_digit)
current_count = LARGEST_INT;
}
pline("Count: %ld", current_count);
custompline(SUPPRESS_HISTORY, "Count: %ld", current_count);
current_char = curses_read_char();
}
@@ -647,13 +647,17 @@ curses_get_count(int first_digit)
/* Convert the given NetHack text attributes into the format curses
understands, and return that format mask. */
understands, and return that format mask. */
int
curses_convert_attr(int attr)
{
int curses_attr;
/* first, strip off control flags masked onto the display attributes
(caller should have already done this...) */
attr &= ~(ATR_URGENT | ATR_NOHISTORY);
switch (attr) {
case ATR_NONE:
curses_attr = A_NORMAL;