nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

fix recover

Browse Source 
I tried to reproduce #812 so that I could check whether the suggested
fix worked but I discovered that external 'recover' was broken by the
coordxy changes.

The fix is trivial but I haven't gone back to #812.
This commit is contained in:
PatR
2022-07-17 14:25:51 -07:00
parent ad56ce0d1f
commit 70b8bc04e7
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
util/recover.c
View File

@@ -1,4 +1,4 @@
/* NetHack 3.7 recover.c $NHDT-Date: 1596498262 2020/08/03 23:44:22 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.22 $ */ /* NetHack 3.7 recover.c $NHDT-Date: 1658093138 2022/07/17 21:25:38 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.31 $ */
/* Copyright (c) Janet Walz, 1992. */ /* Copyright (c) Janet Walz, 1992. */
/* NetHack may be freely redistributed. See license for details. */ /* NetHack may be freely redistributed. See license for details. */
@@ -208,7 +208,7 @@ restore_savefile(char *basename)
{ {
int gfd, lfd, sfd; int gfd, lfd, sfd;
int res = 0, lev, savelev, hpid, pltmpsiz, filecmc; int res = 0, lev, savelev, hpid, pltmpsiz, filecmc;
coordxy levc; xint8 levc;
struct version_info version_data; struct version_info version_data;
struct savefile_info sfi; struct savefile_info sfi;
char plbuf[PL_NSIZ], indicator; char plbuf[PL_NSIZ], indicator;
@@ -345,14 +345,14 @@ restore_savefile(char *basename)
(void) unlink(lock); (void) unlink(lock);
for (lev = 1; lev < 256 && res == 0; lev++) { for (lev = 1; lev < 256 && res == 0; lev++) {
/* level numbers are kept in coordxys in save.c, so the /* level numbers are kept in 'xint8's in save.c, so the
* maximum level number (for the endlevel) must be < 256 * maximum level number (for the endlevel) must be < 256
*/ */
if (lev != savelev) { if (lev != savelev) {
lfd = open_levelfile(lev); lfd = open_levelfile(lev);
if (lfd >= 0) { if (lfd >= 0) {
/* any or all of these may not exist */ /* any or all of these may not exist */
levc = (coordxy) lev; levc = (xint8) lev;
if (write(sfd, (genericptr_t) &levc, sizeof levc) if (write(sfd, (genericptr_t) &levc, sizeof levc)
!= sizeof levc) != sizeof levc)
res = -1; res = -1;