Fix #H4014: still crashing on MacOS 10.11

This commit is contained in:
Jean-Christophe Collet
2015-12-11 17:02:28 +01:00
parent 3db5f106df
commit 9558f2d9d8
2 changed files with 1 additions and 5 deletions
+1 -2
View File
@@ -12,7 +12,7 @@ looking at distant objects while wearing the Eyes of the Overworld made their
message when cursed wand zapped by a monster happens to explode was suppressed message when cursed wand zapped by a monster happens to explode was suppressed
if hero was deaf, even though that message has no audible component if hero was deaf, even though that message has no audible component
support explicit 'symset:default' and 'symset:Default symbols' in options support explicit 'symset:default' and 'symset:Default symbols' in options
Crash during startup if player name set as 'player' in defaults
Platform- and/or Interface-Specific Fixes Platform- and/or Interface-Specific Fixes
----------------------------------------- -----------------------------------------
@@ -40,4 +40,3 @@ NetHack Community Patches (or Variation) Included
Code Cleanup and Reorganization Code Cleanup and Reorganization
------------------------------- -------------------------------
-3
View File
@@ -2139,8 +2139,6 @@ int src;
++bufp; /* skip '='; parseoptions() handles spaces */ ++bufp; /* skip '='; parseoptions() handles spaces */
parseoptions(bufp, TRUE, TRUE); parseoptions(bufp, TRUE, TRUE);
if (plname[0]) /* If a name was given */
plnamesuffix(); /* set the character class */
} else if (match_varname(buf, "AUTOPICKUP_EXCEPTION", 5)) { } else if (match_varname(buf, "AUTOPICKUP_EXCEPTION", 5)) {
add_autopickup_exception(bufp); add_autopickup_exception(bufp);
} else if (match_varname(buf, "MSGTYPE", 7)) { } else if (match_varname(buf, "MSGTYPE", 7)) {
@@ -2215,7 +2213,6 @@ int src;
} else if (match_varname(buf, "NAME", 4)) { } else if (match_varname(buf, "NAME", 4)) {
(void) strncpy(plname, bufp, PL_NSIZ - 1); (void) strncpy(plname, bufp, PL_NSIZ - 1);
plnamesuffix();
} else if (match_varname(buf, "ROLE", 4) } else if (match_varname(buf, "ROLE", 4)
|| match_varname(buf, "CHARACTER", 4)) { || match_varname(buf, "CHARACTER", 4)) {
if ((len = str2role(bufp)) >= 0) if ((len = str2role(bufp)) >= 0)