From: PatR Date: Fri, 19 Feb 2016 18:41:35 +0000 (-0800) Subject: repair tribute save-breaking change X-Git-Tag: NetHack-3.7.0_WIP~772^2 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=27191bf517d1ef6426b8c510261885a90fe9ea25;p=nethack repair tribute save-breaking change I was thinking about iflags rather than context and didn't realize that the change to maxinum number of passages would breal save files. Put the tribute context back to 3.6.0 size. Anyone who grabbed from public git yesterday is potentially in for some temporary trouble. That's the risk they take for trying to stay on the bleeding edge. --- diff --git a/include/context.h b/include/context.h index c6ed0832d..fc0c28dca 100644 --- a/include/context.h +++ b/include/context.h @@ -1,4 +1,4 @@ -/* NetHack 3.6 context.h $NHDT-Date: 1455835579 2016/02/18 22:46:19 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.29 $ */ +/* NetHack 3.6 context.h $NHDT-Date: 1455907260 2016/02/19 18:41:00 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.30 $ */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* NetHack may be freely redistributed. See license for details. */ @@ -93,10 +93,10 @@ struct tribute_info { struct novel_tracking { /* for choosing random passage when reading novel */ unsigned id; /* novel oid from previous passage selection */ int count; /* number of passage indices available in pasg[] */ - xchar pasg[20]; /* pasg[0..count-1] are passage indices */ - /* tribute file is allowed to have more than 20 passages for a novel; - if it does, reading will first choose a random subset of 20 of them; - reading all 20 or switching to a different novel and then back again + xchar pasg[30]; /* pasg[0..count-1] are passage indices */ + /* tribute file is allowed to have more than 30 passages for a novel; + if it does, reading will first choose a random subset of 30 of them; + reading all 30 or switching to a different novel and then back again will pick a new subset, independent of previous ones so might not contain all--or even any--of the ones left out of the prior subset; chatting with Death works the same as reading a novel except that