Merge branch 'NetHack-3.6'

This commit is contained in:
nhmall
2019-12-01 19:30:09 -05:00
42 changed files with 100 additions and 101 deletions

View File

@@ -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