more updates

DEVEL/code_features.txt

@@ -1,4 +1,4 @@
-# NetHack 3.7  code_features.txt $NHDT-Date: 1596498264 2020/08/03 23:44:24 $  $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.6 $
+# NetHack 5.0  code_features.txt $NHDT-Date: 1596498264 2020/08/03 23:44:24 $  $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.6 $
 # Copyright (c) 2015 by Michael Allison
 # NetHack may be freely redistributed.  See license for details.
 
@@ -115,7 +115,7 @@ and available to all NetHack source files.
 decl.c variable definitions are generally laid out in much the same
 order as their corresponding declarations in decl.h.
 
-A new header file cstd.h was added to coincide with 3.7's switch to
+A new header file cstd.h was added to coincide with 5.0's switch to
 C99. It contains calls to some C99 standard header files.
 
 =================== NEXT FEATURE ==========================

DEVEL/hooksdir/NHsubst

@@ -392,9 +392,9 @@ $TEST-Branch: theirs $
 
 TEST 8:
 <<< d1
-/* NetHack 3.7        objnam.c        $TEST-Date$ $TEST-Branch$:$TEST-Revision$ */
+/* NetHack 5.0        objnam.c        $TEST-Date$ $TEST-Branch$:$TEST-Revision$ */
 ===
-/* NetHack 3.7        objnam.c        $TEST-Date: 1426977394 2015/03/21 22:36:34 $  $TEST-Branch: master $:$TEST-Revision: 1.108 $ */
+/* NetHack 5.0        objnam.c        $TEST-Date: 1426977394 2015/03/21 22:36:34 $  $TEST-Branch: master $:$TEST-Revision: 1.108 $ */
 >>> d3
 
 =for nhgitset NHsubst NetHack merge driver

Porting

@@ -1,4 +1,4 @@
-  NetHack Porting Guidelines		v 3.7			2023-04-23
+  NetHack Porting Guidelines		v 5.0			2023-04-23
 
 
      1.0	Introduction

include/display.h

@@ -27,12 +27,12 @@
  * Returns true if the hero can sense the given monster.  This includes
  * monsters that are hiding or mimicking other monsters.
  *
- * [3.7] Note: the map doesn't display any monsters when hero is swallowed
+ * [5.0] Note: the map doesn't display any monsters when hero is swallowed
  * (or display non-adjacent, non-submerged ones when hero is underwater),
  * so treat those situations as blocking telepathy, detection, and warning
  * even though conceptually they shouldn't do so.
  *
- * [3.7 also] The macros whose name begins with an underscore have been
+ * [5.0 also] The macros whose name begins with an underscore have been
  * converted to functions in order to have compilers generate smaller code.
  * The retained underscore versions are still used in display.c but should
  * only be used in other situations if the function calls actually produce
@@ -138,7 +138,7 @@
  * creature in an apparently empty spot.
  * Infravision is not relevant; we assume that invisible monsters are also
  * invisible to infravision.
- * [3.7: the macro definition erroneously started with 'mtmp->minvis' for
+ * [5.0: the macro definition erroneously started with 'mtmp->minvis' for
  * over 20 years.  The one place it's used called it as knowninvisible(mtmp)
  * so worked by coincidence when there was no argument expansion involved
  * on the first line.]

include/patchlevel.h

@@ -7,8 +7,8 @@
 #define PATCHLEVEL_H
 
 /* NetHack 5.0.x */
-#define VERSION_MAJOR 3
+#define VERSION_MAJOR 5
-#define VERSION_MINOR 7
+#define VERSION_MINOR 0
 /*
  * PATCHLEVEL is updated for each release.
  */
@@ -17,7 +17,7 @@
  * Incrementing EDITLEVEL can be used to force invalidation of old bones
  * and save files.
  */
-#define EDITLEVEL 141
+#define EDITLEVEL 0
 
 /*
  * Development status possibilities.
@@ -30,7 +30,7 @@
 /*
  * Development status of this NetHack version.
  */
-#define NH_DEVEL_STATUS NH_STATUS_WIP
+#define NH_DEVEL_STATUS NH_STATUS_RELEASED
 
 #ifndef DEBUG  /* allow tool chains to define without causing warnings */
 #define DEBUG
@@ -75,7 +75,7 @@
 /*  Patch 7, February 16, 2023
  *
  *  during engraving, spaces were counted instead of non-space (cherry-pick of
- *      4e0a1e04 from NetHack-3.7)
+ *      4e0a1e04 from NetHack WIP)
  *  avoid potential buffer overflow in append_str()
  *  resolve missing dependency in NetHack.sln
  *  code in include/tradstdc.h was trying to suppress warn_unused result by

include/sym.h

@@ -1,4 +1,4 @@
-/* NetHack	3.7	sym.h	$NHDT-Date: $ $NHDT-Branch: $ $NHDT-Revision: $ */
+/* NetHack	5.0	sym.h	$NHDT-Date: $ $NHDT-Branch: $ $NHDT-Revision: $ */
 /*      Copyright (c) 2016 by Pasi Kallinen              */
 /* NetHack may be freely redistributed.  See license for details. */
 

src/.gitattributes

@@ -16,4 +16,4 @@ qt_xcmd.moc	NH_filesgentag=>qt_kde0.moc
 qt_yndlg.moc	NH_filesgentag=>qt_kde0.moc
 
 tile.c		NH_filesgentag=(file%s_optionally_generated_by_tilemap_at_compile_time)
-monstr.c	NH_filesgentag=(file%s_generated_by_makedefs_-m_but_unused_in_3.7)
+monstr.c	NH_filesgentag=(file%s_generated_by_makedefs_-m_but_unused_in_5.0)

src/light.c

@@ -522,7 +522,7 @@ relink_light_sources(boolean ghostly)
 
     /*
      * Caveat:
-     *  There has been at least one instance during to-be-3.7 development
+     *  There has been at least one instance during to-be-5.0 development
      *  where the light_base linked list ended up with a circular link.
      *  If that happens, then once all the traversed elements have their
      *  LSF_NEEDS_FIXUP flag cleared, the traversal attempt will run wild.

src/mhitm.c

@@ -919,7 +919,7 @@ gulpmm(
          *  -> relmon() used to call remove_monster() for the dead
          *  monster even when it wasn't the one on the map, so we
          *  needed to put magr back after mdef was killed and removed
-         *  from their shared spot.  But now [3.7] relmon() calls
+         *  from their shared spot.  But now [5.0] relmon() calls
          *  mon_leaving_level() and that checks whether the monster at
          *  dying monster's coordinates is that dying monster and only
          *  removes it when they match.  So magr is still at mdef's

src/objnam.c

@@ -780,7 +780,7 @@ xname_flags(
                doname() so we've added an external flag to request it */
             Concat(buf, 0, "partly eaten ");
         }
-        if (obj->globby) { /* 3.7 added "medium" to replace no-prefix */
+        if (obj->globby) { /* 5.0 added "medium" to replace no-prefix */
             ConcatF2(buf, 0, "%s %s", (obj->owt <= 100) ? "small"
                                       : (obj->owt <= 300) ? "medium"
                                         : (obj->owt <= 500) ? "large"

src/pickup.c

@@ -544,7 +544,7 @@ allow_category(struct obj *obj)
      *  1) object class (armor, potion, &c);
      *  2) unpaid shop item;
      *  3) bless/curse state (blessed, uncursed, cursed, BUC-unknown).
-     * Version 3.7 added a fourth:
+     * Version 5.0 added a fourth:
      *  4) 'novelty' ('P' for just picked up items).
      * When only one type is present, the situation is simple:
      * to be accepted, obj's status must match one of the entries.

src/rumors.c

@@ -7,7 +7,7 @@
 #include "dlb.h"
 
 /*      [Note:  this comment is fairly old, but still accurate for 3.1;
- *       it's no longer accurate for 3.7 but may still be of interest.]
+ *       it's no longer accurate for 5.0 but may still be of interest.]
  * Rumors have been entirely rewritten to speed up the access.  This is
  * essential when working from floppies.  Using fseek() the way that's done
  * here means rumors following longer rumors are output more often than those

src/version.c

@@ -118,7 +118,7 @@ status_version(char *buf, size_t bufsz, boolean indent)
 #if 0
         /* note: it's possible for branch name to be a prefix of game name
            but that's unlikely enough that we won't bother with it; having
-           branch "nethack-3.7" be a superset of game "nethack" seems like
+           branch "nethack-5.0" be a superset of game "nethack" seems like
            including both is redundant, but having branch "net" be a subset
            of game "nethack" doesn't feel that way; optimizing "net" out
            seems like it would be a mistake */

submodules/CHKSUMS

@@ -1,5 +1,5 @@
 # checksums for fetched submodules
-# NetHack 3.7  CHKSUMS $NHDT-Date: 1693155877 2023/08/27 17:04:37 $  $NHDT-Branch: keni-luacksum $
+# NetHack 5.0  CHKSUMS $NHDT-Date: 1693155877 2023/08/27 17:04:37 $  $NHDT-Branch: keni-luacksum $
 # check:
 #   shasum -a 256 -c -s THISFILE < FILETOCHECK
 # generate:

util/mdgrep.pl

@@ -1,5 +1,5 @@
 #!perl
-# NetHack 3.7  mdgrep.pl  $NHDT-Date: 1710949914 2024/03/20 15:51:54 $  $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.26 $
+# NetHack 5.0  mdgrep.pl  $NHDT-Date: 1710949914 2024/03/20 15:51:54 $  $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.26 $
 # Copyright (c) Kenneth Lorber, Kensington, Maryland
 # NetHack may be freely redistributed.  See license for details.
 
@@ -61,7 +61,7 @@ $outfile = "mdgrep.h";
 sub start_file {
 	($rev) = ('$NHDT-Revision: 1.26 $') =~ m/: (.*) .$/;
 	my $date = '$NHDT-Date: 1710949915 2024/03/20 15:51:55 $';
-	my $branch = '$NHDT-Branch: NetHack-3.7 $';
+	my $branch = '$NHDT-Branch: NetHack-5.0 $';
 	my $revision = '$NHDT-Revision: 1.26 $';
 	open(OUT, ">$outfile") || die "open $outfile: $!";
 # NB: Date and Revision below will be modified when mdgrep.h is written to
@@ -69,7 +69,7 @@ sub start_file {
 # before generating mdgrep.h and committing that file).
 	print OUT <<E_O_M;
 /*
- * NetHack 3.7  $outfile  $date $branch:$revision
+ * NetHack 5.0  $outfile  $date $branch:$revision
  * Copyright (c) Kenneth Lorber, Kensington, Maryland, 2008
  * NetHack may be freely redistributed.  See license for details.
  *

win/win32/NetHackW.rc

@@ -75,7 +75,7 @@ BEGIN
         MENUITEM "&Lock Windows",               IDM_SETTING_LOCKWINDOWS
     END
     POPUP "&Help"
-    // 3.7: HELP_LONG and HELP_OPTIONS_LONG both used to specify &L as their
+    // 5.0: HELP_LONG and HELP_OPTIONS_LONG both used to specify &L as their
     // accelator.  Typing 'L' or 'l' highlighted one of the two, then <enter>
     // would execute it or typing another 'l' or 'L' would unhighlight the
     // currently highlit one and highlight the other.  All other accelerators