Merge branch 'NetHack-3.6.2'

This commit is contained in:
nhmall
2019-03-20 09:28:48 -04:00
7 changed files with 83 additions and 64 deletions

View File

@@ -1,4 +1,4 @@
/* NetHack 3.6 mapglyph.c $NHDT-Date: 1526429201 2018/05/16 00:06:41 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.47 $ */
/* NetHack 3.6 mapglyph.c $NHDT-Date: 1552945095 2019/03/18 21:38:15 $ $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.48 $ */
/* Copyright (c) David Cohrs, 1991 */
/* NetHack may be freely redistributed. See license for details. */
@@ -249,7 +249,7 @@ int glyph;
return encbuf;
}
const char *
char *
decode_mixed(buf, str)
char *buf;
const char *str;
@@ -257,8 +257,8 @@ const char *str;
static const char hex[] = "00112233445566778899aAbBcCdDeEfF";
char *put = buf;
if (!put || !str)
return "";
if (!str)
return strcpy(buf, "");
while (*str) {
if (*str == '\\') {