X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;ds=sidebyside;f=saveresume.c;h=d7fe76e5f3d9c79d69e87d57f9b1d082326d5ec0;hb=f5ff25f52aaec53581d371c4d019af75c57fb989;hp=575b11f2486a319ec2090b284ad8ed2a7d05a7ff;hpb=f07b3ba2d4af0b4178a43cf81c5ed0b3e074e53f;p=open-adventure.git diff --git a/saveresume.c b/saveresume.c index 575b11f..d7fe76e 100644 --- a/saveresume.c +++ b/saveresume.c @@ -4,9 +4,9 @@ * (ESR) This replaces a bunch of particularly nasty FORTRAN-derived code; * see the history.adoc file in the source distribution for discussion. * - * Copyright (c) 1977, 2005 by Will Crowther and Don Woods - * Copyright (c) 2017 by Eric S. Raymond - * SPDX-License-Identifier: BSD-2-clause + * SPDX-FileCopyrightText: 1977, 2005 by Will Crowther and Don Woods + * SPDX-FileCopyrightText: 2017 by Eric S. Raymond + * SPDX-License-Identifier: BSD-2-Clause */ #include @@ -29,8 +29,7 @@ /* * If you change the first three members, the resume function may not properly - * reject saves from older versions. Yes, this glues us to a hardware- - * dependent length of int. Later members can change, but bump the version + * reject saves from older versions. Later members can change, but bump the version * when you do that. */ struct save_t { @@ -123,8 +122,7 @@ int resume(void) #endif FILE *fp = NULL; - if (game.loc != 1 || - game.abbrev[1] != 1) { + if (game.loc != LOC_START || game.abbrev[LOC_START] != 1) { rspeak(RESUME_ABANDON); if (!yes_or_no(arbitrary_messages[THIS_ACCEPTABLE], arbitrary_messages[OK_MAN], arbitrary_messages[OK_MAN])) return GO_CLEAROBJ; @@ -172,7 +170,7 @@ int restore(FILE* fp) bool is_valid(struct game_t valgame) { /* Save files can be roughly grouped into three groups: - * With valid, reacheable state, with valid, but unreachable + * With valid, reachable state, with valid, but unreachable * state and with invalid state. We check that state is * valid: no states are outside minimal or maximal value */