From: nhmall Date: Sat, 21 Mar 2015 20:01:03 +0000 (-0400) Subject: remove a troublesome line of code X-Git-Tag: NetHack-3.6.0_RC01~571 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=349e264ac3eccab996cc065867cd2808785d9e32;p=nethack remove a troublesome line of code Whenever SYSCF was enabled on Windows, the option processing would go bonkers with illegal options at startup. I noticed it months ago, and Derek had it happen the other evening. It turns out, the hard-coded 'defaults.nh' setting was being overwritten with the name sysconf on the first SET_IN_SYS pass, so all subsequent passes were re-opening the SYSC_FILE instead of the user config file. I opted to take it out as I couldn't ascertain why it was there in the first place. --- diff --git a/src/files.c b/src/files.c index e85a85ae4..eeebd6e08 100644 --- a/src/files.c +++ b/src/files.c @@ -1,4 +1,4 @@ -/* NetHack 3.5 files.c $NHDT-Date: 1426966692 2015/03/21 19:38:12 $ $NHDT-Branch: master $:$NHDT-Revision: 1.135 $ */ +/* NetHack 3.5 files.c $NHDT-Date: 1426968058 2015/03/21 20:00:58 $ $NHDT-Branch: master $:$NHDT-Revision: 1.136 $ */ /* NetHack 3.5 files.c $Date: 2012/03/10 02:49:08 $ $Revision: 1.124 $ */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* NetHack may be freely redistributed. See license for details. */ @@ -1858,7 +1858,6 @@ int src; } else #endif if ((fp = fopenp(filename, "r")) != (FILE *)0) { - configfile = filename; return(fp); #if defined(UNIX) || defined(VMS) } else {