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

unix check_panic_save

Browse Source 
Inspired by self-recover, sort of.  Enabled for unix by default; can
be disabled by commenting out '#define CHECK_PANIC_SAVE' in unixconf.h.

When starting the game, if there is no save file to restore and no
lock/level files to recover, check whether a panic save file exists.
If there is one, tell the player that it's there and that it might be
viable, then ask whether to start a new game.

It doesn't convert the panic save into a reconverable one (rename by
nethack, then continue trying to restore) or tell the player how to
make it viable (rename to remove ".e" by game admin), just whether it
is present.  If player opts to start a new game, the panic save is
left alone and will trigger the "there's a panic save file" situation
again once the new game finishes and player starts another.
This commit is contained in:
PatR
2024-03-23 10:11:35 -07:00
parent 4d206c1c40
commit ef17c7ac2b
5 changed files with 129 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
src/files.c
View File

@@ -1,4 +1,4 @@
/* NetHack 3.7 files.c $NHDT-Date: 1693083234 2023/08/26 20:53:54 $ $NHDT-Branch: keni-crashweb2 $:$NHDT-Revision: 1.378 $ */
/* NetHack 3.7 files.c $NHDT-Date: 1711213887 2024/03/23 17:11:27 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.397 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/*-Copyright (c) Derek S. Ray, 2015. */
/* NetHack may be freely redistributed. See license for details. */
@@ -1205,6 +1205,50 @@ restore_saved_game(void)
return nhfp;
}
/* called if there is no save file for current character */
int
check_panic_save(void)
{
int result = 0;
#ifdef CHECK_PANIC_SAVE
FILE *cf;
const char *savef;
set_error_savefile();
savef = fqname(gs.SAVEF, SAVEPREFIX, 0);
/*
* This duplicates part of docompress_file().
* We don't want to start by uncompressing just to check for the
* file's existence and then have to recompress it.
*/
#ifdef COMPRESS_EXTENSION
unsigned ln = (unsigned) (strlen(savef) + strlen(COMPRESS_EXTENSION));
char *cfn = (char *) alloc(ln + 1);
Strcpy(cfn, savef);
Strcat(cfn, COMPRESS_EXTENSION);
if ((cf = fopen(cfn, RDBMODE)) != NULL) {
(void) fclose(cf);
result = 1;
}
free((genericptr_t) cfn);
#endif /* COMPRESS_EXTENSION */
if (!result) {
/* maybe it has already been manually uncompressed */
if ((cf = fopen(savef, RDBMODE)) != NULL) {
(void) fclose(cf);
result = 1;
}
}
set_savefile_name(TRUE); /* reset to normal */
#endif /* CHECK_PANIC_SAVE */
return result;
}
#if defined(SELECTSAVED)
char *
@@ -1252,11 +1296,11 @@ plname_from_file(const char *filename, boolean without_wait_synch_per_file)
#define EXTSTR ""
#endif
if ( sscanf( filename, "%*[^/]/%d%63[^.]" EXTSTR, &uid, name ) == 2 ) {
if (sscanf(filename, "%*[^/]/%d%63[^.]" EXTSTR, &uid, name) == 2) {
#undef EXTSTR
/* "_" most likely means " ", which certainly looks nicer */
for (k=0; name[k]; k++)
if ( name[k] == '_' )
for (k = 0; name[k]; k++)
if (name[k] == '_')
name[k] = ' ';
return dupstr(name);
} else
@@ -1376,7 +1420,8 @@ get_saved_games(void)
char *r;
Sprintf(filename, "save/%d%s", uid, name);
r = plname_from_file(filename, ALLOW_WAITSYNCH_PERFILE);
r = plname_from_file(filename,
ALLOW_WAITSYNCH_PERFILE);
if (r)
result[j++] = r;
}
@@ -1629,6 +1674,7 @@ docompress_file(const char *filename, boolean uncomp)
}
free((genericptr_t) cfn);
return;
}
#endif /* COMPRESS : external compression */