The g? structs had a mix of variables that were written to
the savefile, and those that were not.
For better clarity and to distinguish those that end up in
the savefile, relocate some g? variables that get written
directly to the savefile into different structs.
This updates EDITLEVEL, although technically it probably
didn't need to, since savefile contents are not changing.
Details:
gb.bases -> svb.bases
gb.bbubbles -> svb.bbubbles
gb.branches -> svb.branches
gc.context -> svc.context
gd.disco -> svd.disco
gd.dndest -> svd.dndest
gd.doors -> svd.doors
gd.doors_alloc -> svd.doors_alloc
gd.dungeon_topology -> svd.dungeon_topology
gd.dungeons -> svd.dungeons
ge.exclusion_zones -> sve.exclusion_zones
gh.hackpid -> svh.hackpid
gi.inv_pos -> svi.inv_pos
gk.killer -> svk.killer
gl.lastseentyp -> svl.lastseentyp
gl.level -> svl.level
gl.level_info -> svl.level_info
gm.mapseenchn -> svm.mapseenchn
gm.moves -> svm.moves
gm.mvitals -> svm.mvitals
gn.n_dgns -> svn.n_dgns
gn.n_regions -> svn.n_regions
gn.nroom -> svn.nroom
go.oracle_cnt -> svo.oracle_cnt
gp.pl_character -> svp.pl_character
gp.pl_fruit -> svp.pl_fruit
gp.plname -> svp.plname
gp.program_state -> svp.program_state
gq.quest_status -> svq.quest_status
gr.rooms -> svr.rooms
gs.sp_levchn -> svs.sp_levchn
gs.spl_book -> svs.spl_book
gt.timer_id -> svt.timer_id
gt.tune -> svt.tune
gu.updest -> svu.updest
gx.xmax -> svx.xmax
gx.xmin -> svx.xmin
gy.ymax -> svy.ymax
gy.ymin -> svy.ymin
Related note:
There are some pointer variables that are heads of chains that were not
moved from 'g?' to 'sv?', because they are not actually written to the
savefile directly, but the objects/monst/trap/lightsource/timer in the
chains they point to are. That can be changed, if desired.
Examples: gi.invent, gm.migrating_objs, gb.billobjs, gm.migrating_mons,
gf.ftrap, gl.light_base, gt.timer_base
229 lines
5.9 KiB
C
229 lines
5.9 KiB
C
/* NetHack 3.7 pcunix.c $NHDT-Date: 1596498285 2020/08/03 23:44:45 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.42 $ */
|
|
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
|
|
/*-Copyright (c) Michael Allison, 2006. */
|
|
/* NetHack may be freely redistributed. See license for details. */
|
|
|
|
/* This file collects some Unix dependencies; pager.c contains some more */
|
|
|
|
#include "hack.h"
|
|
#include "wintty.h"
|
|
|
|
#include <sys/stat.h>
|
|
#if defined(MSDOS)
|
|
#include <errno.h>
|
|
#endif
|
|
|
|
#if defined(MSDOS)
|
|
extern char orgdir[];
|
|
#endif
|
|
|
|
#if defined(TTY_GRAPHICS)
|
|
extern void backsp(void);
|
|
extern void term_clear_screen(void);
|
|
#endif
|
|
|
|
#if 0
|
|
static struct stat buf;
|
|
#endif
|
|
|
|
#ifdef WANT_GETHDATE
|
|
static struct stat hbuf;
|
|
#endif
|
|
|
|
#if defined(PC_LOCKING) && !defined(SELF_RECOVER)
|
|
static int eraseoldlocks(void);
|
|
#endif
|
|
|
|
#if defined(PC_LOCKING)
|
|
#if !defined(SELF_RECOVER)
|
|
static int
|
|
eraseoldlocks(void)
|
|
{
|
|
int i;
|
|
|
|
/* cannot use maxledgerno() here, because we need to find a lock name
|
|
* before starting everything (including the dungeon initialization
|
|
* that sets astral_level, needed for maxledgerno()) up
|
|
*/
|
|
for (i = 1; i <= MAXDUNGEON * MAXLEVEL + 1; i++) {
|
|
/* try to remove all */
|
|
set_levelfile_name(gl.lock, i);
|
|
(void) unlink(fqname(gl.lock, LEVELPREFIX, 0));
|
|
}
|
|
set_levelfile_name(gl.lock, 0);
|
|
#ifdef HOLD_LOCKFILE_OPEN
|
|
really_close();
|
|
#endif
|
|
if (unlink(fqname(gl.lock, LEVELPREFIX, 0)))
|
|
return 0; /* cannot remove it */
|
|
return (1); /* success! */
|
|
}
|
|
#endif /* SELF_RECOVER */
|
|
|
|
void
|
|
getlock(void)
|
|
{
|
|
int fd, c, ci, ct;
|
|
int fcmask = FCMASK;
|
|
char tbuf[BUFSZ];
|
|
const char *fq_lock;
|
|
#if defined(MSDOS) && defined(NO_TERMS)
|
|
int grmode = iflags.grmode;
|
|
#endif
|
|
/* we ignore QUIT and INT at this point */
|
|
if (!lock_file(HLOCK, LOCKPREFIX, 10)) {
|
|
wait_synch();
|
|
#if defined(CHDIR) && !defined(NOCWD_ASSUMPTIONS)
|
|
chdirx(orgdir, 0);
|
|
#endif
|
|
error("Quitting.");
|
|
}
|
|
|
|
/* regularize(lock); */ /* already done in pcmain */
|
|
Sprintf(tbuf, "%s", fqname(gl.lock, LEVELPREFIX, 0));
|
|
set_levelfile_name(gl.lock, 0);
|
|
fq_lock = fqname(gl.lock, LEVELPREFIX, 1);
|
|
if ((fd = open(fq_lock, 0)) == -1) {
|
|
if (errno == ENOENT)
|
|
goto gotlock; /* no such file */
|
|
#if defined(CHDIR) && !defined(NOCWD_ASSUMPTIONS)
|
|
chdirx(orgdir, 0);
|
|
#endif
|
|
perror(fq_lock);
|
|
unlock_file(HLOCK);
|
|
error("Cannot open %s", fq_lock);
|
|
}
|
|
|
|
(void) nhclose(fd);
|
|
|
|
if (iflags.window_inited) {
|
|
#ifdef SELF_RECOVER
|
|
c = y_n("There are files from a game in progress under your name. "
|
|
"Recover?");
|
|
#else
|
|
pline("There is already a game in progress under your name.");
|
|
pline("You may be able to use \"recover %s\" to get it back.\n",
|
|
tbuf);
|
|
c = y_n("Do you want to destroy the old game?");
|
|
#endif
|
|
} else {
|
|
#if defined(MSDOS) && defined(NO_TERMS)
|
|
grmode = iflags.grmode;
|
|
if (grmode)
|
|
gr_finish();
|
|
#endif
|
|
c = 'n';
|
|
ct = 0;
|
|
#ifdef SELF_RECOVER
|
|
msmsg("There are files from a game in progress under your name. "
|
|
"Recover? [yn]");
|
|
#else
|
|
msmsg("\nThere is already a game in progress under your name.\n");
|
|
msmsg("If this is unexpected, you may be able to use \n");
|
|
msmsg("\"recover %s\" to get it back.", tbuf);
|
|
msmsg("\nDo you want to destroy the old game? [yn] ");
|
|
#endif
|
|
while ((ci = nhgetch()) != '\n') {
|
|
if (ct > 0) {
|
|
msmsg("\b \b");
|
|
ct = 0;
|
|
c = 'n';
|
|
}
|
|
if (ci == 'y' || ci == 'n' || ci == 'Y' || ci == 'N') {
|
|
ct = 1;
|
|
c = ci;
|
|
msmsg("%c", c);
|
|
}
|
|
}
|
|
}
|
|
if (c == 'y' || c == 'Y')
|
|
#ifndef SELF_RECOVER
|
|
if (eraseoldlocks()) {
|
|
goto gotlock;
|
|
} else {
|
|
unlock_file(HLOCK);
|
|
#if defined(CHDIR) && !defined(NOCWD_ASSUMPTIONS)
|
|
chdirx(orgdir, 0);
|
|
#endif
|
|
error("Couldn't destroy old game.");
|
|
}
|
|
#else /*SELF_RECOVER*/
|
|
if (recover_savefile()) {
|
|
#if defined(TTY_GRAPHICS)
|
|
if (WINDOWPORT(tty))
|
|
term_clear_screen(); /* display gets fouled up otherwise */
|
|
#endif
|
|
goto gotlock;
|
|
} else {
|
|
unlock_file(HLOCK);
|
|
#if defined(CHDIR) && !defined(NOCWD_ASSUMPTIONS)
|
|
chdirx(orgdir, 0);
|
|
#endif
|
|
error("Couldn't recover old game.");
|
|
}
|
|
#endif /*SELF_RECOVER*/
|
|
else {
|
|
unlock_file(HLOCK);
|
|
#if defined(CHDIR) && !defined(NOCWD_ASSUMPTIONS)
|
|
chdirx(orgdir, 0);
|
|
#endif
|
|
error("%s", "Cannot start a new game.");
|
|
}
|
|
|
|
gotlock:
|
|
fd = creat(fq_lock, fcmask);
|
|
unlock_file(HLOCK);
|
|
if (fd == -1) {
|
|
#if defined(CHDIR) && !defined(NOCWD_ASSUMPTIONS)
|
|
chdirx(orgdir, 0);
|
|
#endif
|
|
error("cannot creat file (%s.)", fq_lock);
|
|
} else {
|
|
if (write(fd, (char *) &svh.hackpid, sizeof(svh.hackpid))
|
|
!= sizeof(svh.hackpid)) {
|
|
#if defined(CHDIR) && !defined(NOCWD_ASSUMPTIONS)
|
|
chdirx(orgdir, 0);
|
|
#endif
|
|
error("cannot write lock (%s)", fq_lock);
|
|
}
|
|
if (nhclose(fd) == -1) {
|
|
#if defined(CHDIR) && !defined(NOCWD_ASSUMPTIONS)
|
|
chdirx(orgdir, 0);
|
|
#endif
|
|
error("cannot close lock (%s)", fq_lock);
|
|
}
|
|
}
|
|
#if defined(MSDOS) && defined(NO_TERMS)
|
|
if (grmode)
|
|
gr_init();
|
|
#endif
|
|
}
|
|
#endif /* PC_LOCKING */
|
|
|
|
void
|
|
regularize(char *s)
|
|
/*
|
|
* normalize file name - we don't like .'s, /'s, spaces, and
|
|
* lots of other things
|
|
*/
|
|
{
|
|
char *lp;
|
|
|
|
for (lp = s; *lp; lp++)
|
|
if (*lp <= ' ' || *lp == '"' || (*lp >= '*' && *lp <= ',')
|
|
|| *lp == '.' || *lp == '/' || (*lp >= ':' && *lp <= '?') ||
|
|
#ifdef OS2
|
|
*lp == '&' || *lp == '(' || *lp == ')' ||
|
|
#endif
|
|
*lp == '|' || *lp >= 127 || (*lp >= '[' && *lp <= ']'))
|
|
*lp = '_';
|
|
}
|
|
|
|
#ifdef __EMX__
|
|
void
|
|
seteuid(int i)
|
|
{
|
|
;
|
|
}
|
|
#endif
|