Abolish setup check, there's no possibility of restart.

Note, this silently breaks old saves.
This commit is contained in:
Eric S. Raymond 2017-06-13 10:20:15 -04:00
parent 593b8e3caa
commit a3c14ba077
4 changed files with 3 additions and 17 deletions

View file

@ -52,7 +52,6 @@ struct game_t {
long oldobj; long oldobj;
long panic; long panic;
long saved; long saved;
long setup;
long tally; long tally;
long thresh; long thresh;
long trndex; long trndex;

View file

@ -1960,8 +1960,7 @@
199 You prod the nearest dwarf, who wakes up grumpily, takes one look at 199 You prod the nearest dwarf, who wakes up grumpily, takes one look at
199 you, curses, and grabs for his axe. 199 you, curses, and grabs for his axe.
200 Is this acceptable? 200 Is this acceptable?
201 This adventure is already over. To start a new adventure, or to # 201 used to be an error on restart attempt.
201 resume an earlier adventure, please run a fresh copy of the program.
202 The ogre doesn't appear to be hungry. 202 The ogre doesn't appear to be hungry.
203 The ogre, who despite his bulk is quite agile, easily dodges your 203 The ogre, who despite his bulk is quite agile, easily dodges your
203 attack. He seems almost amused by your puny effort. 203 attack. He seems almost amused by your puny effort.

1
init.c
View file

@ -383,6 +383,5 @@ void initialise(void)
game.closed=false; game.closed=false;
game.clshnt=false; game.clshnt=false;
game.novice=false; game.novice=false;
game.setup=1;
game.blklin=true; game.blklin=true;
} }

13
main.c
View file

@ -122,20 +122,9 @@ int main(int argc, char *argv[])
set_seed(seedval); set_seed(seedval);
/* Initialize game variables */ /* Initialize game variables */
if (!game.setup)
initialise(); initialise();
/* Unlike earlier versions, adventure is no longer restartable. (This
* lets us get away with modifying things such as OBJSND(BIRD) without
* having to be able to undo the changes later.) If a "used" copy is
* rerun, we come here and tell the player to run a fresh copy. */
if (game.setup <= 0) {
RSPEAK(201);
exit(0);
}
/* Start-up, dwarf stuff */ /* Start-up, dwarf stuff */
game.setup= -1;
game.zzword=RNDVOC(3,0); game.zzword=RNDVOC(3,0);
game.novice=YES(stdin, 65,1,0); game.novice=YES(stdin, 65,1,0);
game.newloc=1; game.newloc=1;
@ -146,7 +135,7 @@ int main(int argc, char *argv[])
if (logfp) if (logfp)
fprintf(logfp, "seed %ld\n", seedval); fprintf(logfp, "seed %ld\n", seedval);
/* interpret commands ubtil EOF or interrupt */ /* interpret commands until EOF or interrupt */
for (;;) { for (;;) {
if (!do_command(stdin)) if (!do_command(stdin))
break; break;