Merge branch 'NetHack-3.6' of https://github.com/NetHack/NetHack

tnnt-devteam · Dec 10, 2024 · e3346a1 · e3346a1
2 parents c64ed9d + 55561da
commit e3346a1
Show file tree

Hide file tree

Showing 6 changed files with 97 additions and 42 deletions.
diff --git a/doc/fixes36.7 b/doc/fixes36.7
@@ -54,4 +54,6 @@ unix: update Makefile.dat so that if parallel make is used, it will build
 	each other's results
 fix the mingw32 build of NetHack 3.6.7 by updating sys/winnt/Makefile.gcc,
 	sys/winnt/winnt.c and sys/winnt/stubs.c
+correct the Ixoth tile
+makedefs can produce individual bogusmon, engrave and epitaph files
 
diff --git a/doc/makedefs.6 b/doc/makedefs.6
@@ -125,11 +125,25 @@ file.
 .TP
 .B -s
 Generate the
-.I bogusmon
-,
-.I engrave
-and
-.IR epitaph files.
+.IR bogusmon ", " engrave ", and " epitaph " files."
+.br
+.TP
+.B -1
+Generate the
+.IR epitaph
+file.
+.br
+.TP
+.B -2
+Generate the
+.IR engrave
+file.
+.br
+.TP
+.B -3
+Generate the
+.IR bogusmon
+file.
 .br
 .TP
 .B -h

diff --git a/sys/unix/README.linux b/sys/unix/README.linux
@@ -61,6 +61,12 @@ If you have problems, send us some email.
 
 [email protected]
 
+Prerequisite installations that are needed:
+    libncurses-dev
+    flex
+    bison
+    clang or gcc
+
 Recommended steps:
 
 1.  cd sys/unix

diff --git a/sys/unix/hints/linux b/sys/unix/hints/linux
@@ -36,6 +36,16 @@ CFLAGS+=-DCONFIG_ERROR_SECURE=FALSE
 #CFLAGS+=-DSCORE_ON_BOTL
 #CFLAGS+=-DMSGHANDLER
 #CFLAGS+=-DTTY_TILES_ESCCODES
+#detection of clang vs gcc
+CCISCLANG := $(shell echo `$(CC) --version` | grep clang)
+ifneq "$(CCISCLANG)" ""
+# clang-specific follows
+CLANGGTEQ18 := $(shell expr `$(CC) -dumpversion | cut -f1 -d.` \>= 18)
+ifeq "$(CLANGGTEQ18)" "1"
+CFLAGS+=-Wno-deprecated-non-prototype
+endif
+endif  # clang-specific ends here
+
 
 LINK=$(CC)
 # Only needed for GLIBC stack trace:

diff --git a/util/makedefs.c b/util/makedefs.c
@@ -201,6 +201,7 @@ static void FDECL(do_qt_control, (char *));
 static void FDECL(do_qt_text, (char *));
 static void NDECL(adjust_qt_hdrs);
 static void NDECL(put_qt_hdrs);
+static void FDECL(rafile, (int));
 
 #ifdef VISION_TABLES
 static void NDECL(H_close_gen);
@@ -363,28 +364,17 @@ char *options;
             break;
         case 's':
         case 'S':
-            /*
-             * post-3.6.5:
-             *  File must not be empty to avoid divide by 0
-             *  in core's rn2(), so provide a default entry.
-             *  [Second argument is used to construct a temporary file name
-             *  without worrying about whether the file name macros from
-             *  global.h have been modified with port-specific punctuation.]
-             */
-            do_rnd_access_file(EPITAPHFILE, "epitaph",
-                /* default epitaph:  parody of the default engraving */
-                               "No matter where I went, here I am.");
-            do_rnd_access_file(ENGRAVEFILE, "engrave",
-                /* default engraving:  popularized by "The Adventures of
-                   Buckaroo Bonzai Across the 8th Dimenstion" but predates
-                   that 1984 movie; some attribute it to Confucius */
-                               "No matter where you go, there you are.");
-            do_rnd_access_file(BOGUSMONFILE, "bogusmon",
-                /* default bogusmon:  iconic monster that isn't in nethack */
-                               "grue");
-            /* TNNT: robotfindskitten */
+            /* FIXME: does this bit here for TNNT need
+               to be redone? */
             do_rnd_access_file(TNNT_NKIFILE, "nki", "A puppy");
-
+            rafile('1');
+            rafile('2');
+            rafile('3');
+            break;
+        case '1':
+        case '2':
+        case '3':
+            rafile(*options);
             break;
         case 'h':
         case 'H':
@@ -427,6 +417,39 @@ const char *tag;
     Unlink(name);
 }
 
+void
+rafile(whichone)
+int whichone;
+{
+    switch(whichone) {
+            /*
+             * post-3.6.5:
+             *  File must not be empty to avoid divide by 0
+             *  in core's rn2(), so provide a default entry.
+             *  [Second argument is used to construct a temporary file name
+             *  without worrying about whether the file name macros from
+             *  global.h have been modified with port-specific punctuation.]
+             */
+    case '1':
+            do_rnd_access_file(EPITAPHFILE, "epitaph",
+                /* default epitaph:  parody of the default engraving */
+                               "No matter where I went, here I am.");
+            break;
+    case '2':
+            do_rnd_access_file(ENGRAVEFILE, "engrave",
+                /* default engraving:  popularized by "The Adventures of
+                   Buckaroo Bonzai Across the 8th Dimenstion" but predates
+                   that 1984 movie; some attribute it to Confucius */
+                               "No matter where you go, there you are.");
+            break;
+    case '3':
+            do_rnd_access_file(BOGUSMONFILE, "bogusmon",
+                /* default bogusmon:  iconic monster that isn't in nethack */
+                               "grue");
+            break;
+    }
+}
+
 static FILE *
 getfp(template, tag, mode)
 const char *template;

diff --git a/win/share/monsters.txt b/win/share/monsters.txt
@@ -7078,22 +7078,22 @@ Z = (195, 195, 195)
 }
 # tile 371 (Ixoth)
 {
-  ....O......O....
-  ....O......O....
-  ...LOOCDDCOOL...
-  ...DDDDDDDDDDD..
-  .CCDDDGDDGDDDCC.
-  CCDKDDDDDDDDJCCC
-  CDDKKKDIIDJJDCCD
-  CDDKDDKJJJDDDCDD
-  CCDKDDDDDDDDKCDD
-  .CCDKKDDDDKKCDDD
-  .CCDADKDDKDACDD.
-  .DDDADDDDDDADDD.
-  ....CCDDDDKKAA..
-  ...CDDDAADDDKAA.
-  ..CDDDAAA.DDDK..
-  ................
+  ......IIIDA.....
+  .....GDGDDDA....
+  ....IDDDDDDA....
+  ..DCHHD..DDA....
+  CHCHCD..IDDA....
+  HD.D...IDDA.....
+  ......HIDAAAAAA.
+  ....IHIDAAAAAAAA
+  ..IHHIDAJDDJAAA.
+  .IHHHIDDDDDDJAA.
+  .IHHHIDDDDDDDAA.
+  DDHHIIDDDDDDDDA.
+  ID.HIDDHHDDJDJA.
+  IDAAID.AADDADDA.
+  ....IDAAJJJDDJA.
+  ........DDDDJA..
 }
 # tile 372 (Master Kaen)
 {