diff --git a/doc/Guidebook.mn b/doc/Guidebook.mn index e143fb268..3c36c0b09 100644 --- a/doc/Guidebook.mn +++ b/doc/Guidebook.mn @@ -1,4 +1,4 @@ -.\" $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.333 $ $NHDT-Date: 1574900824 2019/11/28 00:27:04 $ +.\" $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.334 $ $NHDT-Date: 1575245028 2019/12/02 00:03:48 $ .\" .\" This is an excerpt from the 'roff' man page from the 'groff' package. .\" NetHack's Guidebook.mn currently does *not* adhere to these guidelines. @@ -24,7 +24,7 @@ .ds vr "NetHack 3.7 .ds f0 "\*(vr .ds f1 -.ds f2 "November 27, 2019 +.ds f2 "December 1, 2019 . .\" A note on some special characters: .\" \(lq = left double quote @@ -4807,7 +4807,7 @@ if your game is compiled with DUMPLOG. Allows the following placeholders: .PL %% literal \(oq\f(CR%\fP\(cq .PL %v -version (eg. \(lq\f(CR3.6.2\-0\fP\(rq) +version (eg. \(lq\f(CR3.6.3\-0\fP\(rq) .PL %u game UID .PL %t diff --git a/doc/Guidebook.tex b/doc/Guidebook.tex index 5afd79a9c..8d7b105e3 100644 --- a/doc/Guidebook.tex +++ b/doc/Guidebook.tex @@ -45,7 +45,7 @@ %.au \author{Original version - Eric S. Raymond\\ (Edited and expanded for 3.6 by Mike Stephenson and others)} -\date{November 27, 2019} +\date{December 1, 2019} \maketitle @@ -5316,7 +5316,7 @@ if your game is compiled with DUMPLOG. Allows the following placeholders: %.sd %.si {\tt \%\%} --- literal `{\tt \%}'\\ -{\tt \%v} --- version (eg. ``{\tt 3.6.2-0}'')\\ +{\tt \%v} --- version (eg. ``{\tt 3.6.3-0}'')\\ {\tt \%u} --- game UID\\ {\tt \%t} --- game start time, UNIX timestamp format\\ {\tt \%T} --- current time, UNIX timestamp format\\ diff --git a/include/config.h b/include/config.h index d12576f9d..b606b5db1 100644 --- a/include/config.h +++ b/include/config.h @@ -1,4 +1,4 @@ -/* NetHack 3.6 config.h $NHDT-Date: 1559601008 2019/06/03 22:30:08 $ $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.123 $ */ +/* NetHack 3.6 config.h $NHDT-Date: 1575245033 2019/12/02 00:03:53 $ $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.126 $ */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /*-Copyright (c) Robert Patrick Rankin, 2016. */ /* NetHack may be freely redistributed. See license for details. */ @@ -554,7 +554,7 @@ typedef unsigned char uchar; #define DUMPLOG_FILE "/tmp/nethack.%n.%d.log" /* DUMPLOG_FILE allows following placeholders: %% literal '%' - %v version (eg. "3.6.2-0") + %v version (eg. "3.6.3-0") %u game UID %t game start time, UNIX timestamp format %T current time, UNIX timestamp format diff --git a/src/attrib.c b/src/attrib.c index a50d93eb0..31c9fef67 100644 --- a/src/attrib.c +++ b/src/attrib.c @@ -1,4 +1,4 @@ -/* NetHack 3.6 attrib.c $NHDT-Date: 1553363417 2019/03/23 17:50:17 $ $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.65 $ */ +/* NetHack 3.6 attrib.c $NHDT-Date: 1575245050 2019/12/02 00:04:10 $ $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.66 $ */ /* Copyright 1988, 1989, 1990, 1992, M. Stephenson */ /* NetHack may be freely redistributed. See license for details. */ @@ -147,7 +147,7 @@ int msgflg; /* positive => no message, zero => message, and */ * taken below the minimum, reduce max value (peak reached) * instead. That means that restore ability and repeated * applications of unicorn horn will not be able to recover - * all the lost value. Starting will 3.6.2, we only take away + * all the lost value. As of 3.6.2, we only take away * some (average half, possibly zero) of the excess from max * instead of all of it, but without intervening recovery, it * can still eventually drop to the minimum allowed. After diff --git a/src/cmd.c b/src/cmd.c index 8bd50d1c4..c49a35959 100644 --- a/src/cmd.c +++ b/src/cmd.c @@ -1,4 +1,4 @@ -/* NetHack 3.6 cmd.c $NHDT-Date: 1573346187 2019/11/10 00:36:27 $ $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.349 $ */ +/* NetHack 3.6 cmd.c $NHDT-Date: 1575245052 2019/12/02 00:04:12 $ $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.350 $ */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /*-Copyright (c) Robert Patrick Rankin, 2013. */ /* NetHack may be freely redistributed. See license for details. */ @@ -2014,7 +2014,7 @@ int final; enlght_out(buf); } - /* 3.6.2: dungeon level, so that ^X really has all status info as + /* As of 3.6.2: dungeon level, so that ^X really has all status info as claimed by the comment below; this reveals more information than the basic status display, but that's one of the purposes of ^X; similar information is revealed by #overview; the "You died in diff --git a/src/detect.c b/src/detect.c index 5af21a22f..e35d3829a 100644 --- a/src/detect.c +++ b/src/detect.c @@ -1,4 +1,4 @@ -/* NetHack 3.6 detect.c $NHDT-Date: 1574882659 2019/11/27 19:24:19 $ $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.99 $ */ +/* NetHack 3.6 detect.c $NHDT-Date: 1575245054 2019/12/02 00:04:14 $ $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.100 $ */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /*-Copyright (c) Robert Patrick Rankin, 2018. */ /* NetHack may be freely redistributed. See license for details. */ @@ -1334,7 +1334,7 @@ struct obj *sobj; /* scroll--actually fake spellbook--object */ * Unlike when casting the spell, it is much too intrustive when * in the midst of walking around or combatting monsters. * - * For 3.6.2, show terrain, then object, then monster like regular + * As of 3.6.2, show terrain, then object, then monster like regular * map updating, except in this case the map locations get marked * as seen from every direction rather than just from direction of * hero. Skilled spell marks revealed objects as 'seen up close' diff --git a/src/do.c b/src/do.c index ccaf43dc7..9cf5669ad 100644 --- a/src/do.c +++ b/src/do.c @@ -1,4 +1,4 @@ -/* NetHack 3.6 do.c $NHDT-Date: 1575056306 2019/11/29 19:38:26 $ $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.195 $ */ +/* NetHack 3.6 do.c $NHDT-Date: 1575245055 2019/12/02 00:04:15 $ $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.196 $ */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /*-Copyright (c) Derek S. Ray, 2015. */ /* NetHack may be freely redistributed. See license for details. */ @@ -165,7 +165,7 @@ const char *verb; since trapped target is a sitting duck */ int damage, dieroll = 1; - /* 3.6.2: this was calling hmon() unconditionally + /* As of 3.6.2: this was calling hmon() unconditionally so always credited/blamed the hero but the boulder might have been thrown by a giant or launched by a rolling boulder trap triggered by a monster or diff --git a/src/dokick.c b/src/dokick.c index bcafe15b2..924aeccee 100644 --- a/src/dokick.c +++ b/src/dokick.c @@ -1,4 +1,4 @@ -/* NetHack 3.6 dokick.c $NHDT-Date: 1562462061 2019/07/07 01:14:21 $ $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.133 $ */ +/* NetHack 3.6 dokick.c $NHDT-Date: 1575245057 2019/12/02 00:04:17 $ $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.136 $ */ /* Copyright (c) Izchak Miller, Mike Stephenson, Steve Linhart, 1989. */ /* NetHack may be freely redistributed. See license for details. */ @@ -1758,7 +1758,7 @@ long num; Strcpy(obuf, optr); if (num) { /* means: other objects are impacted */ - /* 3.6.2: use a separate buffer for the suffix to avoid risk of + /* As of 3.6.2: use a separate buffer for the suffix to avoid risk of overrunning obuf[] (let pline() handle truncation if necessary) */ Sprintf(xbuf, " %s %s object%s", otense(otmp, "hit"), (num == 1L) ? "another" : "other", (num > 1L) ? "s" : ""); diff --git a/src/end.c b/src/end.c index f37caf8ad..381063da4 100644 --- a/src/end.c +++ b/src/end.c @@ -1,4 +1,4 @@ -/* NetHack 3.6 end.c $NHDT-Date: 1573869062 2019/11/16 01:51:02 $ $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.180 $ */ +/* NetHack 3.6 end.c $NHDT-Date: 1575245059 2019/12/02 00:04:19 $ $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.181 $ */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /*-Copyright (c) Robert Patrick Rankin, 2012. */ /* NetHack may be freely redistributed. See license for details. */ @@ -948,7 +948,7 @@ int size; /* max value is less than 20 */ #if 0 /* * odds_and_ends() was used for 3.6.0 and 3.6.1. - * Schroedinger's Cat is handled differently starting with 3.6.2. + * Schroedinger's Cat is handled differently as of 3.6.2. */ static boolean FDECL(odds_and_ends, (struct obj *, int)); diff --git a/src/invent.c b/src/invent.c index 34fe3c083..cc6bd353c 100644 --- a/src/invent.c +++ b/src/invent.c @@ -1,4 +1,4 @@ -/* NetHack 3.6 invent.c $NHDT-Date: 1574982020 2019/11/28 23:00:20 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.280 $ */ +/* NetHack 3.7 invent.c $NHDT-Date: 1575245062 2019/12/02 00:04:22 $ $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.267 $ */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /*-Copyright (c) Derek S. Ray, 2015. */ /* NetHack may be freely redistributed. See license for details. */ @@ -466,8 +466,8 @@ const genericptr vptr2; * (fragile) or by avoiding sortloot() during inventory display * (more robust). * - * 3.6.2 reverts to the temporary array of ordered obj pointers - * but has sortloot() do the counting and allocation. Callers + * As of 3.6.2: revert to the temporary array of ordered obj pointers + * but have sortloot() do the counting and allocation. Callers * need to use array traversal instead of linked list traversal * and need to free the temporary array when done. And the * array contains 'struct sortloot_item' (aka 'Loot') entries diff --git a/src/mhitu.c b/src/mhitu.c index 08970c232..e3057bb6c 100644 --- a/src/mhitu.c +++ b/src/mhitu.c @@ -1,4 +1,4 @@ -/* NetHack 3.6 mhitu.c $NHDT-Date: 1573688693 2019/11/13 23:44:53 $ $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.167 $ */ +/* NetHack 3.6 mhitu.c $NHDT-Date: 1575245065 2019/12/02 00:04:25 $ $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.168 $ */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /*-Copyright (c) Robert Patrick Rankin, 2012. */ /* NetHack may be freely redistributed. See license for details. */ @@ -1398,7 +1398,7 @@ register struct attack *mattk; (Teleport_control && !Stunned && !unconscious()) ? "" : "very "); tele(); - /* 3.6.2: make sure damage isn't fatal; previously, it + /* As of 3.6.2: make sure damage isn't fatal; previously, it was possible to be teleported and then drop dead at the destination when QM's 1d4 damage gets applied below; even though that wasn't "wrong", it seemed strange, @@ -2015,7 +2015,7 @@ struct attack *mattk; is_animal(mtmp->data) ? "regurgitates" : "expels"); expels(mtmp, mtmp->data, FALSE); } else if (!u.uswldtim || g.youmonst.data->msize >= MZ_HUGE) { - /* 3.6.2: u.uswldtim used to be set to 0 by life-saving but it + /* As of 3.6.2: u.uswldtim used to be set to 0 by life-saving but it expels now so the !u.uswldtim case is no longer possible; however, polymorphing into a huge form while already swallowed is still possible */ diff --git a/src/minion.c b/src/minion.c index 925fccfd4..6a8a06ee7 100644 --- a/src/minion.c +++ b/src/minion.c @@ -1,4 +1,4 @@ -/* NetHack 3.6 minion.c $NHDT-Date: 1572530226 2019/10/31 13:57:06 $ $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.43 $ */ +/* NetHack 3.6 minion.c $NHDT-Date: 1575245071 2019/12/02 00:04:31 $ $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.44 $ */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /*-Copyright (c) Robert Patrick Rankin, 2008. */ /* NetHack may be freely redistributed. See license for details. */ @@ -390,7 +390,7 @@ aligntyp atyp; /* A_NONE is used for 'any alignment' */ struct permonst *ptr; /* - * 3.6.2: [fix #H2204, 22-Dec-2010, eight years later...] + * 3.6.2: [fixed #H2204, 22-Dec-2010, eight years later...] * pick a correctly aligned demon in one try. This used to * use mkclass() to choose a random demon type and keep trying * (up to 20 times) until it got one with the desired alignment. diff --git a/src/monmove.c b/src/monmove.c index 4e6a9e6a9..b72353629 100644 --- a/src/monmove.c +++ b/src/monmove.c @@ -1,4 +1,4 @@ -/* NetHack 3.6 monmove.c $NHDT-Date: 1574530078 2019/11/23 17:27:58 $ $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.115 $ */ +/* NetHack 3.6 monmove.c $NHDT-Date: 1575245074 2019/12/02 00:04:34 $ $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.116 $ */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /*-Copyright (c) Michael Allison, 2006. */ /* NetHack may be freely redistributed. See license for details. */ @@ -1444,7 +1444,7 @@ register int after; add_damage(mtmp->mx, mtmp->my, 0L); } } else if (levl[mtmp->mx][mtmp->my].typ == IRONBARS) { - /* 3.6.2: was using may_dig() but it doesn't handle bars */ + /* As of 3.6.2: was using may_dig() but it doesn't handle bars */ if (!(levl[mtmp->mx][mtmp->my].wall_info & W_NONDIGGABLE) && (dmgtype(ptr, AD_RUST) || dmgtype(ptr, AD_CORR))) { if (canseemon(mtmp)) diff --git a/src/objnam.c b/src/objnam.c index 64f8b473f..fe19f9a3c 100644 --- a/src/objnam.c +++ b/src/objnam.c @@ -1,4 +1,4 @@ -/* NetHack 3.6 objnam.c $NHDT-Date: 1574648942 2019/11/25 02:29:02 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.271 $ */ +/* NetHack 3.7 objnam.c $NHDT-Date: 1575245076 2019/12/02 00:04:36 $ $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.255 $ */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /*-Copyright (c) Robert Patrick Rankin, 2011. */ /* NetHack may be freely redistributed. See license for details. */ @@ -429,7 +429,7 @@ unsigned cxn_flags; /* bitmask of CXN_xxx values */ buf = nextobuf() + PREFIX; /* leave room for "17 -3 " */ if (Role_if(PM_SAMURAI) && Japanese_item_name(typ)) actualn = Japanese_item_name(typ); - /* 3.6.2: this used to be part of 'dn's initialization, but it + /* As of 3.6.2: this used to be part of 'dn's initialization, but it needs to come after possibly overriding 'actualn' */ if (!dn) dn = actualn; diff --git a/src/options.c b/src/options.c index 856149166..5cfbc84fd 100644 --- a/src/options.c +++ b/src/options.c @@ -1,4 +1,4 @@ -/* NetHack 3.6 options.c $NHDT-Date: 1574982022 2019/11/28 23:00:22 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.416 $ */ +/* NetHack 3.7 options.c $NHDT-Date: 1575245078 2019/12/02 00:04:38 $ $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.391 $ */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /*-Copyright (c) Michael Allison, 2008. */ /* NetHack may be freely redistributed. See license for details. */ @@ -179,7 +179,7 @@ static const struct Bool_Opt { #else { "page_wait", (boolean *) 0, FALSE, SET_IN_FILE }, #endif - /* 3.6.2: move perm_invent from flags to iflags and out of save file */ + /* moved perm_invent from flags to iflags and out of save file in 3.6.2 */ { "perm_invent", &iflags.perm_invent, FALSE, SET_IN_GAME }, { "pickup_thrown", &flags.pickup_thrown, TRUE, SET_IN_GAME }, { "popup_dialog", &iflags.wc_popup_dialog, FALSE, SET_IN_GAME }, /*WC*/ @@ -2595,7 +2595,7 @@ boolean tinitial, tfrom_file; } if (!op) return FALSE; - /* 3.6.2: strip leading and trailing spaces, condense internal ones */ + /* stripped leading and trailing spaces, condensed internal ones in 3.6.2 */ mungspaces(op); if (!g.opt_initial) { struct fruit *f; diff --git a/src/restore.c b/src/restore.c index 6aae06343..181f6c426 100644 --- a/src/restore.c +++ b/src/restore.c @@ -1,4 +1,4 @@ -/* NetHack 3.6 restore.c $NHDT-Date: 1575081102 2019/11/30 02:31:42 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.155 $ */ +/* NetHack 3.7 restore.c $NHDT-Date: 1575245087 2019/12/02 00:04:47 $ $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.136 $ */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /*-Copyright (c) Michael Allison, 2009. */ /* NetHack may be freely redistributed. See license for details. */ @@ -346,7 +346,7 @@ boolean ghostly, frozen; /* * TODO: Remove this after 3.6.x save compatibility is dropped. * - * For 3.6.2, SchroedingersBox() always has a cat corpse in it. + * As of 3.6.2, SchroedingersBox() always has a cat corpse in it. * For 3.6.[01], it was empty and its weight was falsified * to have the value it would have had if there was one inside. * Put a non-rotting cat corpse in this box to convert to 3.6.2. diff --git a/src/steed.c b/src/steed.c index c145b09a1..f8e680d7d 100644 --- a/src/steed.c +++ b/src/steed.c @@ -1,4 +1,4 @@ -/* NetHack 3.6 steed.c $NHDT-Date: 1574648944 2019/11/25 02:29:04 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.74 $ */ +/* NetHack 3.7 steed.c $NHDT-Date: 1575245090 2019/12/02 00:04:50 $ $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.68 $ */ /* Copyright (c) Kevin Hugo, 1998-1999. */ /* NetHack may be freely redistributed. See license for details. */ @@ -245,7 +245,7 @@ boolean force; /* Quietly force this animal */ } if (mtmp->data == &mons[PM_LONG_WORM] && (u.ux + u.dx != mtmp->mx || u.uy + u.dy != mtmp->my)) { - /* 3.6.2: test_move(below) is used to check for trying to mount + /* As of 3.6.2: test_move(below) is used to check for trying to mount diagonally into or out of a doorway or through a tight squeeze; attempting to mount a tail segment when hero was not adjacent to worm's head could trigger an impossible() in worm_cross() diff --git a/src/teleport.c b/src/teleport.c index 0c8847149..50e179cc2 100644 --- a/src/teleport.c +++ b/src/teleport.c @@ -1,4 +1,4 @@ -/* NetHack 3.6 teleport.c $NHDT-Date: 1570227405 2019/10/04 22:16:45 $ $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.93 $ */ +/* NetHack 3.6 teleport.c $NHDT-Date: 1575245091 2019/12/02 00:04:51 $ $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.94 $ */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /*-Copyright (c) Robert Patrick Rankin, 2011. */ /* NetHack may be freely redistributed. See license for details. */ @@ -687,7 +687,7 @@ boolean break_the_rules; /* True: wizard mode ^T */ if (!Teleportation || (u.ulevel < (Role_if(PM_WIZARD) ? 8 : 12) && !can_teleport(g.youmonst.data))) { /* Try to use teleport away spell. - 3.6.2: this used to require that you know the spellbook + Prior to 3.6.2 this used to require that you know the spellbook (probably just intended as an optimization to skip the lookup loop) but it is possible to know and cast a spell after forgetting its book due to amnesia. */ diff --git a/src/u_init.c b/src/u_init.c index 5ecbf7562..707117dca 100644 --- a/src/u_init.c +++ b/src/u_init.c @@ -1,4 +1,4 @@ -/* NetHack 3.6 u_init.c $NHDT-Date: 1539510426 2018/10/14 09:47:06 $ $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.43 $ */ +/* NetHack 3.6 u_init.c $NHDT-Date: 1575245094 2019/12/02 00:04:54 $ $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.60 $ */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /*-Copyright (c) Robert Patrick Rankin, 2017. */ /* NetHack may be freely redistributed. See license for details. */ @@ -1110,7 +1110,7 @@ register struct trobj *trop; if (obj->oclass == ARMOR_CLASS) { if (is_shield(obj) && !uarms && !(uwep && bimanual(uwep))) { setworn(obj, W_ARMS); - /* 3.6.2: this used to unset uswapwep if it was set, but + /* Prior to 3.6.2 this used to unset uswapwep if it was set, but wearing a shield doesn't prevent having an alternate weapon ready to swap with the primary; just make sure we aren't two-weaponing (academic; no one starts that way) */ diff --git a/src/windows.c b/src/windows.c index 749a95236..47c61f89a 100644 --- a/src/windows.c +++ b/src/windows.c @@ -1,4 +1,4 @@ -/* NetHack 3.6 windows.c $NHDT-Date: 1573869064 2019/11/16 01:51:04 $ $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.58 $ */ +/* NetHack 3.6 windows.c $NHDT-Date: 1575245096 2019/12/02 00:04:56 $ $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.60 $ */ /* Copyright (c) D. Cohrs, 1993. */ /* NetHack may be freely redistributed. See license for details. */ @@ -1155,7 +1155,7 @@ boolean fullsubs; /* True -> full substitution for file name, False -> else Strcpy(tmpbuf, "{current date+time}"); break; - case 'v': /* version, eg. "3.6.2-0" */ + case 'v': /* version, eg. "3.6.3-0" */ Sprintf(tmpbuf, "%s", version_string(verbuf)); break; case 'u': /* UID */ diff --git a/sys/amiga/.gitattributes b/sys/amiga/.gitattributes index 732c6177e..5df6a5f30 100644 --- a/sys/amiga/.gitattributes +++ b/sys/amiga/.gitattributes @@ -1,2 +1,2 @@ *.p NHSUBST -* NH_filestag=(file%s_for_Amiga_versions_-_untested_for_3.6.2) +* NH_filestag=(file%s_for_Amiga_versions_-_untested_for_3.6.3) diff --git a/sys/atari/.gitattributes b/sys/atari/.gitattributes index dea950a06..66c510f6c 100644 --- a/sys/atari/.gitattributes +++ b/sys/atari/.gitattributes @@ -1 +1 @@ -* NH_filestag=(file%s_for_Atari_version_-_untested_for_3.6.2) +* NH_filestag=(file%s_for_Atari_version_-_untested_for_3.6.3) diff --git a/sys/be/.gitattributes b/sys/be/.gitattributes index 76f62f434..9d9a35874 100644 --- a/sys/be/.gitattributes +++ b/sys/be/.gitattributes @@ -1 +1 @@ -* NH_filestag=(file%s_for_BeOS_version_-_untested_for_3.6.2) +* NH_filestag=(file%s_for_BeOS_version_-_untested_for_3.6.3) diff --git a/sys/msdos/.gitattributes b/sys/msdos/.gitattributes index f24897760..77cd3847b 100644 --- a/sys/msdos/.gitattributes +++ b/sys/msdos/.gitattributes @@ -4,6 +4,6 @@ Makefile.* NHSUBST Install.* NHSUBST moveinit.pat NH_header=no vesa.h NH_header=no -* NH_filestag=(file%s_for_MSDOS_version_-_untested_for_3.6.2) +* NH_filestag=(file%s_for_MSDOS_version_-_tested_for_3.6.3_via_cross-compile_only) nhico.uu NH_filestag=(file%s_for_running_MSDOS_binary_under_Windows) nhpif.uu NH_filestag=>nhico.uu diff --git a/sys/os2/.gitattributes b/sys/os2/.gitattributes index 9a0ea4eb3..0537d04f5 100644 --- a/sys/os2/.gitattributes +++ b/sys/os2/.gitattributes @@ -1,2 +1,2 @@ Makefile.* NHSUBST -* NH_filestag=(file%s_for_OS/2_version_-_untested_for_3.6.2) +* NH_filestag=(file%s_for_OS/2_version_-_untested_for_3.6.3) diff --git a/sys/share/.gitattributes b/sys/share/.gitattributes index 6169bc89e..a34fbc350 100644 --- a/sys/share/.gitattributes +++ b/sys/share/.gitattributes @@ -5,16 +5,16 @@ dgn_comp.h NH_header=no lev_comp.h NH_header=no Makefile.lib NH_header=no -Makefile.lib NH_filestag=(file%s_for_MSDOS_and_OS/2_versions_-_untested_for_3.6.2) -#termcap.uu NH_filestag=(file%s_for_MSDOS_and_OS/2_versions_-_untested_for_3.6.2) +Makefile.lib NH_filestag=(file%s_for_MSDOS_and_OS/2_versions_-_untested_for_3.6.3) +#termcap.uu NH_filestag=(file%s_for_MSDOS_and_OS/2_versions_-_untested_for_3.6.3) termcap.uu NH_filestag=>Makefile.lib -pcmain.c NH_filestag=(file_for_MSDOS,_OS/2,_Amiga,_and_Atari_versions_-_untested_for_3.6.2) +pcmain.c NH_filestag=(file_for_MSDOS,_OS/2,_Amiga,_and_Atari_versions_-_untested_for_3.6.3) -pcsys.c NH_filestag=(file%s_for_MSDOS,_OS/2_and_Atari_versions_-_untested_for_3.6.2) +pcsys.c NH_filestag=(file%s_for_MSDOS,_OS/2_and_Atari_versions_-_tested_on_MSDOS_for_3.6.3_via_cross-compile_only) pcunix.c NH_filestag=>pcsys.c -NetHack.cnf NH_filestag=(file_for_MSDOS,_OS/2,_and_Atari_versions_-_untested_for_3.6.2) +NetHack.cnf NH_filestag=(file_for_MSDOS,_OS/2,_and_Atari_versions_-_untested_for_3.6.3) pctty.c NH_filestag=>NetHack.cnf ioctl.c NH_filestag=(file%s_for_UNIX_and_Be_versions) diff --git a/sys/unix/README.linux b/sys/unix/README.linux index 64c73674c..b98d4cc7c 100644 --- a/sys/unix/README.linux +++ b/sys/unix/README.linux @@ -1,6 +1,6 @@ NetHack 3.6.0 Linux Elf -$NHDT-Date: 1524684188 2018/04/25 19:23:08 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.22 $ +$NHDT-Date: 1575245121 2019/12/02 00:05:21 $ $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.25 $ This README provides the instructions for using the official Linux binary, system platform requirements, as well as steps used to create that binary. @@ -26,10 +26,10 @@ home directory you might perform these steps. If you have old record and logfile entries from a previous NetHack version, you might want to save copies before they get overwritten by the new empty -files; old saved games and bones files from 3.6.0 and 3.6.1 should work -with 3.6.2 but even older saved games and bones files from 3.4.3 will not. -If you are installing from the RPM, there is no need to save the old record -and logfile; they are automatically preserved. +files; old saved games and bones files from 3.6.0 through to 3.6.2 should +work with 3.6.3 but even older saved games and bones files from 3.4.3 will +not. If you are installing from the RPM, there is no need to save the old +record and logfile; they are automatically preserved. In addition to data files for running the game, you will find other useful things in /usr/games/lib/nethackdir (such as a copy of this README :-). diff --git a/sys/unix/sysconf b/sys/unix/sysconf index 856d36b18..7a5c8a1c4 100644 --- a/sys/unix/sysconf +++ b/sys/unix/sysconf @@ -1,4 +1,4 @@ -# NetHack 3.6 sysconf $NHDT-Date: 1573943504 2019/11/16 22:31:44 $ $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.31 $ +# NetHack 3.6 sysconf $NHDT-Date: 1575245127 2019/12/02 00:05:27 $ $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.32 $ # Copyright (c) 2015 by Kenneth Lorber, Kensington, Maryland # NetHack may be freely redistributed. See license for details. # @@ -95,7 +95,7 @@ MAXPLAYERS=10 # Only available if NetHack was compiled with DUMPLOG # Allows following placeholders: # %% literal '%' -# %v version (eg. "3.6.2-0") +# %v version (eg. "3.6.3-0") # %u game UID # %t game start time, UNIX timestamp format # %T current time, UNIX timestamp format diff --git a/sys/vms/Install.vms b/sys/vms/Install.vms index 91fb0eeed..dc6b11e2d 100644 --- a/sys/vms/Install.vms +++ b/sys/vms/Install.vms @@ -507,6 +507,6 @@ Notes: minimally updated 9-NOV-2015... and again 5-MAY-2019... -# NetHack 3.6 Install.vms $NHDT-Date: 1557701798 2019/05/12 22:56:38 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.15 $ +# NetHack 3.7 Install.vms $NHDT-Date: 1575245132 2019/12/02 00:05:32 $ $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.16 $ # Copyright (c) 2003 by Robert Patrick Rankin # NetHack may be freely redistributed. See license for details. diff --git a/sys/wince/.gitattributes b/sys/wince/.gitattributes index b3d2a6646..8e28791ce 100644 --- a/sys/wince/.gitattributes +++ b/sys/wince/.gitattributes @@ -1,4 +1,4 @@ *.ce NHSUBST *.mak NHSUBST *.bat NHSUBST -* NH_filestag=(file%s_for_Windows_CE_and_PocketPC_-_untested_for_3.6.2) +* NH_filestag=(file%s_for_Windows_CE_and_PocketPC_-_untested_for_3.6.3) diff --git a/sys/wince/ceinc/.gitattributes b/sys/wince/ceinc/.gitattributes index 1763a5005..8e72b80f0 100644 --- a/sys/wince/ceinc/.gitattributes +++ b/sys/wince/ceinc/.gitattributes @@ -1 +1 @@ -* NH_filestag=(header_file%s_for_Windows_CE_and_PocketPC_-_untested_for_3.6.2) +* NH_filestag=(header_file%s_for_Windows_CE_and_PocketPC_-_untested_for_3.6.3) diff --git a/sys/wince/winhack.rc b/sys/wince/winhack.rc index 10a0a03f5..c85fdec67 100644 --- a/sys/wince/winhack.rc +++ b/sys/wince/winhack.rc @@ -284,8 +284,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,6,1,0 - PRODUCTVERSION 3,6,2,0 + FILEVERSION 3,6,3,0 + PRODUCTVERSION 3,6,3,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x9L @@ -300,17 +300,17 @@ BEGIN BEGIN BLOCK "040904b0" BEGIN - VALUE "Comments", "NetHack 3.6.2 for Windows CE\0" + VALUE "Comments", "NetHack 3.6.3 for Windows CE\0" VALUE "CompanyName", " \0" VALUE "FileDescription", "nethackm\0" - VALUE "FileVersion", "3, 6, 2, 0\0" + VALUE "FileVersion", "3, 6, 3, 0\0" VALUE "InternalName", "nethackm\0" - VALUE "LegalCopyright", "Copyright © 1985-2018\0" + VALUE "LegalCopyright", "Copyright © 1985-2019\0" VALUE "LegalTrademarks", "\0" VALUE "OriginalFilename", "nethackm.exe\0" VALUE "PrivateBuild", "090914\0" VALUE "ProductName", "NetHack\0" - VALUE "ProductVersion", "3, 6, 2, 0\0" + VALUE "ProductVersion", "3, 6, 3, 0\0" VALUE "SpecialBuild", "\0" END END diff --git a/sys/wince/winhcksp.rc b/sys/wince/winhcksp.rc index 2ac6e1710..04f7aec40 100644 --- a/sys/wince/winhcksp.rc +++ b/sys/wince/winhcksp.rc @@ -260,8 +260,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,6,1,0 - PRODUCTVERSION 3,6,1,0 + FILEVERSION 3,6,3,0 + PRODUCTVERSION 3,6,3,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x9L @@ -276,17 +276,17 @@ BEGIN BEGIN BLOCK "040904b0" BEGIN - VALUE "Comments", "NetHack 3.6.2 for Smartphone 2002\0" + VALUE "Comments", "NetHack 3.6.3 for Smartphone 2002\0" VALUE "CompanyName", " \0" VALUE "FileDescription", "nethackm\0" - VALUE "FileVersion", "3, 6, 2, 0\0" + VALUE "FileVersion", "3, 6, 3, 0\0" VALUE "InternalName", "nethackm\0" - VALUE "LegalCopyright", "Copyright © 1985-2018\0" + VALUE "LegalCopyright", "Copyright © 1985-2019\0" VALUE "LegalTrademarks", "\0" VALUE "OriginalFilename", "nethackm.exe\0" VALUE "PrivateBuild", "090914\0" VALUE "ProductName", "NetHack For Smartphone\0" - VALUE "ProductVersion", "3, 6, 2, 0\0" + VALUE "ProductVersion", "3, 6, 3, 0\0" VALUE "SpecialBuild", "\0" END END diff --git a/sys/winnt/Install.nt b/sys/winnt/Install.nt index 48c2dddd4..5b87226c1 100644 --- a/sys/winnt/Install.nt +++ b/sys/winnt/Install.nt @@ -5,7 +5,7 @@ NetHack 3.6 on a Windows system (Windows 7/8.x/10 or later only) ============================================================== - Last revision: $NHDT-Date: 1554784481 2019/04/09 04:34:41 $ + Last revision: $NHDT-Date: 1575245156 2019/12/02 00:05:56 $ Credit for the porting of NetHack to the Win32 Console Subsystem goes to the NT Porting Team started by Michael Allison. @@ -16,7 +16,7 @@ contributed the port. Alex Kompel, Dion Nicolaas, Yitzhak Sapir, Derek S. Ray, Michael Allison, Pasi Kallinen, Bart House, and Janet Walz contributed to the maintainance -of the tty and graphical windows versions of NetHack 3.6.2. +of the tty and graphical windows versions of NetHack 3.6.3. You can build a TTY version of NetHack and a Windows Graphical version. You can use one of the following build environments: @@ -93,11 +93,10 @@ using. Change to the directory win\win32\vs2017 and run "build.bat". * Optional curses window-port support * -Starting with 3.6.2, the community patch for a window-port that uses -curses was incorporated into the NetHack source code tree. That window-port, -which evolved from work originally done by Karl Garrison, has been used in -several NetHack variants and on nethack.alt.org and on -www.hardfought.org/nethack/. +Since 3.6.2, the community patch for a window-port that uses curses has been +incorporated into the NetHack source code tree. That window-port, which +evolved from work originally done by Karl Garrison, has been used in several +NetHack variants and on nethack.alt.org and on www.hardfought.org/nethack/. If you want to include the curses window-port support in your Visual Studio build, you will have to first obtain the PDCurses sources from @@ -152,7 +151,7 @@ a 32-bit x86 version, or a 64-bit x64 version. The default Makefile is set up for a 32-bit x86 version, but that's only because it will run on the most number of existing Windows environments. -NetHack's save files and bones files in the 3.6.2 release have not yet +NetHack's save files and bones files in the 3.6.3 release have not yet evolved enough to allow them to interchange between the 32-bit version and the 64-bit version (or between different platforms). Hopefully that will change in an upcoming release. @@ -204,8 +203,8 @@ Setting Up source tree. cd src -2. Starting with 3.6.2, the community patch for an optional curses - window-port was incorporated into the NetHack source code tree. That +2. Since 3.6.2, the community patch for an optional curses window-port + has been incorporated into the NetHack source code tree. That window-port, which evolved from work originally done by Karl Garrison, has been used in several NetHack variants and on nethack.alt.org and on www.hardfought.org/nethack/. The optional curses window-port is diff --git a/sys/winnt/console.rc b/sys/winnt/console.rc index 0d9733971..427079ede 100644 --- a/sys/winnt/console.rc +++ b/sys/winnt/console.rc @@ -1,4 +1,4 @@ -/* NetHack 3.6 console.rc $NHDT-Date: 1432512793 2015/05/25 00:13:13 $ $NHDT-Branch: master $:$NHDT-Revision: 1.10 $ */ +/* NetHack 3.6 console.rc $NHDT-Date: 1575245149 2019/12/02 00:05:49 $ $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.13 $ */ /* Copyright (c) Yitzhak Sapir, 2002. */ /* NetHack may be freely redistributed. See license for details. */ @@ -12,8 +12,8 @@ // VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,6,2,0 - PRODUCTVERSION 3,6,2,0 + FILEVERSION 3,6,3,0 + PRODUCTVERSION 3,6,3,0 FILEFLAGSMASK 0x1fL #ifdef _DEBUG FILEFLAGS 0x9L @@ -29,13 +29,13 @@ BEGIN BLOCK "040904b0" BEGIN VALUE "FileDescription", "NetHack for Windows - TTY Interface\0" - VALUE "FileVersion", "3.6.2\0" + VALUE "FileVersion", "3.6.3\0" VALUE "InternalName", "NetHack\0" - VALUE "LegalCopyright", "Copyright (C) 1985 - 2018. By Stichting Mathematisch Centrum and M. Stephenson. See license for details.\0" + VALUE "LegalCopyright", "Copyright (C) 1985 - 2019. By Stichting Mathematisch Centrum and M. Stephenson. See license for details.\0" VALUE "OriginalFilename", "NetHack.exe\0" VALUE "PrivateBuild", "050102\0" VALUE "ProductName", "NetHack\0" - VALUE "ProductVersion", "3.6.2\0" + VALUE "ProductVersion", "3.6.3\0" END END BLOCK "VarFileInfo" diff --git a/sys/winnt/nethack.def b/sys/winnt/nethack.def index 9d3a5cceb..bc08347a1 100644 --- a/sys/winnt/nethack.def +++ b/sys/winnt/nethack.def @@ -1,5 +1,5 @@ NAME NETHACK -DESCRIPTION 'NetHack 3.6.2 for Windows' +DESCRIPTION 'NetHack 3.6.3 for Windows' EXETYPE WINDOWS STUB 'WINSTUB.EXE' CODE PRELOAD MOVEABLE DISCARDABLE diff --git a/win/gem/.gitattributes b/win/gem/.gitattributes index 133df44a1..e108c78d7 100644 --- a/win/gem/.gitattributes +++ b/win/gem/.gitattributes @@ -1 +1 @@ -* NH_filestag=(file%s_for_GEM_versions_-_untested_for_3.6.2) +* NH_filestag=(file%s_for_GEM_versions_-_untested_for_3.6.3) diff --git a/win/gnome/.gitattributes b/win/gnome/.gitattributes index b1449f357..013227bc8 100644 --- a/win/gnome/.gitattributes +++ b/win/gnome/.gitattributes @@ -1 +1 @@ -* NH_filestag=(file%s_for_GNOME_versions_-_untested_for_3.6.2) +* NH_filestag=(file%s_for_GNOME_versions_-_untested_for_3.6.3) diff --git a/win/macosx/NetHackGuidebook.applescript b/win/macosx/NetHackGuidebook.applescript index e91d12e03..dd05a3a8f 100644 --- a/win/macosx/NetHackGuidebook.applescript +++ b/win/macosx/NetHackGuidebook.applescript @@ -1,5 +1,5 @@ #!/usr/bin/osascript -# NetHack 3.6.2 NetHackGuidebook.applescript $NHDT-Date: 1524684596 2018/04/25 19:29:56 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.8 $ +# NetHack 3.6.3 NetHackGuidebook.applescript $NHDT-Date: 1575245175 2019/12/02 00:06:15 $ $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.10 $ # Copyright (c) Kenneth Lorber, Kensington, Maryland, 2011 # NetHack may be freely redistributed. See license for details. diff --git a/win/macosx/NetHackTerm.applescript b/win/macosx/NetHackTerm.applescript index a4936d021..7c31b1610 100644 --- a/win/macosx/NetHackTerm.applescript +++ b/win/macosx/NetHackTerm.applescript @@ -1,5 +1,5 @@ #!/usr/bin/osascript -# NetHack 3.6.2 NetHackTerm.applescript $NHDT-Date: 1524684597 2018/04/25 19:29:57 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.8 $ +# NetHack 3.6.3 NetHackTerm.applescript $NHDT-Date: 1575245179 2019/12/02 00:06:19 $ $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.10 $ # Copyright (c) Kenneth Lorber, Kensington, Maryland, 2011 # NetHack may be freely redistributed. See license for details. diff --git a/win/tty/wintty.c b/win/tty/wintty.c index 8bbcaca32..8d60a5f7e 100644 --- a/win/tty/wintty.c +++ b/win/tty/wintty.c @@ -1,4 +1,4 @@ -/* NetHack 3.6 wintty.c $NHDT-Date: 1571787079 2019/10/22 23:31:19 $ $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.223 $ */ +/* NetHack 3.6 wintty.c $NHDT-Date: 1575245194 2019/12/02 00:06:34 $ $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.227 $ */ /* Copyright (c) David Cohrs, 1991 */ /* NetHack may be freely redistributed. See license for details. */ @@ -3961,7 +3961,7 @@ unsigned long *colormasks; enclev = stat_cap_indx(); break; } - /* 3.6.2 we only render on BL_FLUSH (or BL_RESET) */ + /* As of 3.6.2 we only render on BL_FLUSH (or BL_RESET) */ return; } diff --git a/win/win32/mswproc.c b/win/win32/mswproc.c index 1cc94103c..f584f9844 100644 --- a/win/win32/mswproc.c +++ b/win/win32/mswproc.c @@ -1,4 +1,4 @@ -/* NetHack 3.6 mswproc.c $NHDT-Date: 1545705822 2018/12/25 02:43:42 $ $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.130 $ */ +/* NetHack 3.6 mswproc.c $NHDT-Date: 1575245201 2019/12/02 00:06:41 $ $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.137 $ */ /* Copyright (C) 2001 by Alex Kompel */ /* NetHack may be freely redistributed. See license for details. */ @@ -2316,7 +2316,7 @@ logDebug(const char *fmt, ...) /* Reading and writing settings from the registry. */ #define CATEGORYKEY "Software" #define COMPANYKEY "NetHack" -#define PRODUCTKEY "NetHack 3.6.2" +#define PRODUCTKEY "NetHack 3.6.3" #define SETTINGSKEY "Settings" #define MAINSHOWSTATEKEY "MainShowState" #define MAINMINXKEY "MainMinX"