Changeset 1171
- Timestamp:
- 12/31/07 09:16:21 (10 months ago)
- Files:
-
- 1.8.2/trunk/CHANGES.182 (modified) (2 diffs)
- 1.8.2/trunk/Makefile.SH (modified) (1 diff)
- 1.8.2/trunk/Patchlevel (modified) (1 diff)
- 1.8.2/trunk/UPGRADING (modified) (1 diff)
- 1.8.2/trunk/game/txt/hlp/pennv182.hlp (modified) (3 diffs)
- 1.8.2/trunk/game/txt/hlp/pennvOLD.hlp (modified) (1 diff)
- 1.8.2/trunk/hdrs/version.h (modified) (1 diff)
- 1.8.2/trunk/src/move.c (modified) (3 diffs)
- 1.8.2/trunk/src/utils.c (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
1.8.2/trunk/CHANGES.182
r1161 r1171 14 14 ========================================================================== 15 15 16 Version 1.8.2 patchlevel 8 ??? ??, 200?16 Version 1.8.2 patchlevel 8 Jan 01, 2008 17 17 18 18 Minor changes: … … 36 36 * The open database file wasn't getting closed on a failed save. 37 37 * Crash bug in sortkey(). Fix by Nathan Baum. 38 * Crash bug in pathological container cases reported by Paige@M*U*S*H 39 fixed by Javelin. 38 40 * 'help @desc' brings up @describe instead of @descformat. 39 41 Suggested by Nymeria. 1.8.2/trunk/Makefile.SH
r557 r1171 206 206 update-hdr: 207 207 -@$touch options.h.dist 208 -@sleep 2 208 209 -@$perl utils/update.pl options.h options.h.dist 209 210 1.8.2/trunk/Patchlevel
r1100 r1171 1 1 Do not edit this file. It is maintained by the official PennMUSH patches. 2 This is PennMUSH 1.8.2p 72 This is PennMUSH 1.8.2p8 1.8.2/trunk/UPGRADING
r1027 r1171 117 117 *** target version of PennMUSH. PennMUSH 1.7.7+ can no longer read 118 118 *** 1.7.4 databases. 119 120 *** If you are upgrading from 1.7.6 or certain 1.7.7 versions, 121 *** you may also first need to load your database under PennMUSH 122 *** 1.8.0p13 and then dump it, and load this converted database 123 *** under your target version of PennMUSH. 119 124 120 125 ============================================================================ 1.8.2/trunk/game/txt/hlp/pennv182.hlp
r1114 r1171 1 & 1.8.2p 71 & 1.8.2p8 2 2 & changes 3 3 This is a list of changes in this patchlevel which are probably of … … 12 12 be read in 'help patchlevels'. 13 13 14 Version 1.8.2 patchlevel 8 Jan 01, 2008 15 16 Minor changes: 17 * 'make versions' now provides some feedback. 18 19 Fixes: 20 * width() and height() do not return 0 when set to invalid input. 21 By Talvo. 22 * Array underflow bug found by running under Valgrind. 23 24 & 1.8.2p7 14 25 Version 1.8.2 patchlevel 7 October 6, 2007 15 26 … … 24 35 * The open database file wasn't getting closed on a failed save. 25 36 * Crash bug in sortkey(). Fix by Nathan Baum. 37 * Crash bug in pathological container cases reported by Paige@M*U*S*H 38 fixed by Javelin. 26 39 * 'help @desc' brings up @describe instead of @descformat. 27 40 Suggested by Nymeria. 1.8.2/trunk/game/txt/hlp/pennvOLD.hlp
r1100 r1171 4418 4418 type 'help <version>p<patchlevel>'. For example, 'help 1.7.2p3' 4419 4419 4420 1.8.2: 0, 1, 2, 3, 4, 5, 6, 7 4420 1.8.2: 0, 1, 2, 3, 4, 5, 6, 7, 8 4421 4421 1.8.1: 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 4422 4422 1.8.0: 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13 1.8.2/trunk/hdrs/version.h
r1114 r1171 1 1 #define VERSION "1.8.2" 2 #define PATCHLEVEL " 7"3 #define PATCHDATE "[ 10/06/2007]"4 #define NUMVERSION 100800200 72 #define PATCHLEVEL "8" 3 #define PATCHDATE "[01/01/2008]" 4 #define NUMVERSION 1008002008 1.8.2/trunk/src/move.c
r1027 r1171 101 101 /* The tricky bit here is that we only care about the zone of 102 102 * the outermost contents */ 103 if (GoodObject(absold) && GoodObject(Zone(absold)) 104 && (Zone(absloc) != Zone(absold))) 103 if (GoodObject(absold) && GoodObject(Zone(absold)) && 104 (!GoodObject(absloc) || !GoodObject(Zone(absloc)) || 105 (Zone(absloc) != Zone(absold)))) 105 106 did_it_interact(what, Zone(absold), "ZLEAVE", NULL, "OZLEAVE", NULL, 106 107 "AZLEAVE", old, NA_INTER_SEE); … … 112 113 NA_INTER_SEE); 113 114 /* If the player is entering a new zone, do zone messages */ 114 if (!GoodObject(absold) 115 || (GoodObject(Zone(absloc)) && (Zone(absloc) != Zone(absold)))) 115 if (GoodObject(absloc) && GoodObject(Zone(absloc)) && 116 (!GoodObject(absold) || !GoodObject(Zone(absold)) || 117 (Zone(absloc) != Zone(absold)))) 116 118 did_it_interact(what, Zone(absloc), "ZENTER", NULL, "OZENTER", NULL, 117 119 "AZENTER", where, NA_INTER_SEE); 118 did_it_interact(what, where, "ENTER", NULL, "OENTER", T("has arrived."),119 "AENTER", where, NA_INTER_PRESENCE);120 did_it_interact(what, where, "ENTER", NULL, "OENTER", 121 T("has arrived."), "AENTER", where, NA_INTER_PRESENCE); 120 122 } else { 121 123 /* non-listeners only trigger the actions not the messages */ 122 124 did_it(what, old, NULL, NULL, NULL, NULL, "ALEAVE", old); 123 if (GoodObject(absold) && GoodObject(Zone(absold)) 124 && (Zone(absloc) != Zone(absold))) 125 if (GoodObject(absold) && GoodObject(Zone(absold)) && 126 (!GoodObject(absloc) || !GoodObject(Zone(absloc)) || 127 (Zone(absloc) != Zone(absold)))) 125 128 did_it(what, Zone(absold), NULL, NULL, NULL, NULL, "AZLEAVE", old); 126 if (!GoodObject(absold) 127 || (GoodObject(Zone(absloc)) && (Zone(absloc) != Zone(absold)))) 129 if (GoodObject(absloc) && GoodObject(Zone(absloc)) && 130 (!GoodObject(absold) || !GoodObject(Zone(absold)) || 131 (Zone(absloc) != Zone(absold)))) 128 132 did_it(what, Zone(absloc), NULL, NULL, NULL, NULL, "AZENTER", where); 129 133 did_it(what, where, NULL, NULL, NULL, NULL, "AENTER", where); … … 131 135 } 132 136 if (!nomovemsgs) 133 did_it_interact(what, what, "MOVE", NULL, "OMOVE", NULL, "AMOVE", where,134 NA_INTER_SEE);137 did_it_interact(what, what, "MOVE", NULL, "OMOVE", NULL, 138 "AMOVE", where, NA_INTER_SEE); 135 139 } 136 140 1.8.2/trunk/src/utils.c
r1107 r1171 761 761 return NOTHING; 762 762 while (!IsRoom(room)) { 763 if (!GoodObject(Location(room)))764 return room;765 763 room = Location(room); 766 764 rec++;
