use .jnethackrc

diff --git a/include/ntconf.h b/include/ntconf.h
index 50b9bf8..32c5fc1 100644 (file)
--- a/include/ntconf.h
+++ b/include/ntconf.h
@@ -82,8 +82,13 @@
                      * objects being thrown when the hangup occurs.    \
                      */
 
+#if 0 /*JP*/
 #define CONFIG_FILE ".nethackrc"
 #define CONFIG_TEMPLATE ".nethackrc.template"
+#else
+#define CONFIG_FILE ".jnethackrc"
+#define CONFIG_TEMPLATE ".jnethackrc.template"
+#endif
 #define SYSCF_TEMPLATE "sysconf.template"
 #define SYMBOLS_TEMPLATE "symbols.template"
 #define GUIDEBOOK_FILE "Guidebook.txt"

diff --git a/src/files.c b/src/files.c
index 43aaabc..f7e688a 100644 (file)
--- a/src/files.c
+++ b/src/files.c
@@ -1941,8 +1941,12 @@ const char *filename;
 
 const char *default_configfile =
 #ifdef UNIX
+#if 0 /*JP*/
     ".nethackrc";
 #else
+    ".jnethackrc";
+#endif
+#else
 #if defined(MAC) || defined(__BEOS__)
     "NetHack Defaults";
 #else

diff --git a/sys/winnt/.nethackrc.template b/sys/winnt/.nethackrc.template
index b2bacbd..178629b 100644 (file)
--- a/sys/winnt/.nethackrc.template
+++ b/sys/winnt/.nethackrc.template
@@ -17,7 +17,8 @@
 #
 # Use the IBM character set rather than just plain ascii characters
 # for tty window-port.
-OPTIONS=symset:IBMGraphics_2,roguesymset:RogueEpyx
+#OPTIONS=symset:IBMGraphics_2,roguesymset:RogueEpyx
+OPTIONS=symset:default
 
 # Here is a suggested symbol set from Michael Feir, 
 # for use by blind NetHack players

diff --git a/sys/winnt/Makefile.msc b/sys/winnt/Makefile.msc
index 5c4edb9..e7a5f03 100644 (file)
--- a/sys/winnt/Makefile.msc
+++ b/sys/winnt/Makefile.msc
@@ -702,7 +702,7 @@ $(O)install.tag:    $(DAT)\data     $(DAT)\rumors    $(DAT)\dungeon \
        if exist $(DOC)\nethack.txt copy $(DOC)\nethack.txt $(GAMEDIR)\NetHack.txt
        @if exist $(GAMEDIR)\JNetHack.PDB echo NOTE: You may want to remove $(GAMEDIR:\=/)/JNetHack.PDB to conserve space
        @if exist $(GAMEDIR)\JNetHackW.PDB echo NOTE: You may want to remove $(GAMEDIR:\=/)/JNetHackW.PDB to conserve space
-       if exist $(MSWSYS)\.nethackrc.template copy $(MSWSYS)\.nethackrc.template $(GAMEDIR)
+       if exist $(MSWSYS)\.nethackrc.template copy $(MSWSYS)\.nethackrc.template $(GAMEDIR)\.jnethackrc.template
        -if not exist $(GAMEDIR)\record. goto>$(GAMEDIR)\record.
        echo install done > $@
 

diff --git a/win/win32/vs2017/afternethack.proj b/win/win32/vs2017/afternethack.proj
index ca39fdd..de6b59b 100644 (file)
--- a/win/win32/vs2017/afternethack.proj
+++ b/win/win32/vs2017/afternethack.proj
@@ -4,11 +4,11 @@
   <!-- TODO not copying record -->
   <Target Name="Build"
        Inputs="$(SysWinntDir).nethackrc.template;$(DocDir)Guidebook.txt;$(DatDir)license;$(SysWinntDir)sysconf.template;$(DocDir)nethack.txt;$(DatDir)symbols;$(WinWin32Dir)record;$(DatDir)opthelp"
-       Outputs="$(BinDir).nethackrc.template;$(BinDir)Guidebook.txt;$(BinDir)license;$(BinDir)sysconf.template;$(BinDir)symbols.template;$(BinDir)record;$(BinDir)opthelp">
+       Outputs="$(BinDir).jnethackrc.template;$(BinDir)Guidebook.txt;$(BinDir)license;$(BinDir)sysconf.template;$(BinDir)symbols.template;$(BinDir)record;$(BinDir)opthelp">
     <Copy SourceFiles="$(SysWinntDir).nethackrc.template;$(DocDir)Guidebook.txt;$(DatDir)license;$(SysWinntDir)sysconf.template;$(DocDir)nethack.txt;$(DatDir)symbols;$(WinWin32Dir)record;$(DatDir)opthelp"
-             DestinationFiles="$(BinDir).nethackrc.template;$(BinDir)Guidebook.txt;$(BinDir)license;$(BinDir)sysconf.template;$(BinDir)nethack.txt;$(BinDir)symbols.template;$(BinDir)record;$(BinDir)opthelp" />
+             DestinationFiles="$(BinDir).jnethackrc.template;$(BinDir)Guidebook.txt;$(BinDir)license;$(BinDir)sysconf.template;$(BinDir)nethack.txt;$(BinDir)symbols.template;$(BinDir)record;$(BinDir)opthelp" />
   </Target>
   <Target Name="Clean">
-       <Delete Files="$(BinDir).nethackrc.template;$(BinDir)Guidebook.txt;$(BinDir)license;$(BinDir)sysconf.template;$(BinDir)nethack.txt;$(BinDir)symbols.template;$(BinDir)record;$(BinDir)opthelp"/>
+       <Delete Files="$(BinDir).jnethackrc.template;$(BinDir)Guidebook.txt;$(BinDir)license;$(BinDir)sysconf.template;$(BinDir)nethack.txt;$(BinDir)symbols.template;$(BinDir)record;$(BinDir)opthelp"/>
   </Target>
 </Project>