make_zzword() moved to initialize. Pruned unused stuff from cheat.c

This commit is contained in:
Aaron Traas 2017-07-02 01:07:53 -04:00
parent 6c822610c5
commit f815299a2a
3 changed files with 15 additions and 12 deletions

21
cheat.c
View file

@ -1,12 +1,16 @@
/*
* 'cheat' is a tool for generating save game files to test states that ought
* not happen. It leverages chunks of advent, mostly initialize() and
* savefile(), so we know we're always outputing save files that advent
* can import.
*/
#include <getopt.h> #include <getopt.h>
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>
#include <stdbool.h> #include <stdbool.h>
#include <time.h>
#include "advent.h" #include "advent.h"
#include "dungeon.h"
FILE *logfp = NULL, *rfp = NULL; FILE *logfp = NULL;
bool oldstyle = false; bool oldstyle = false;
bool prompt = true; bool prompt = true;
@ -17,6 +21,7 @@ int main(int argc, char *argv[])
long numdie = 0; long numdie = 0;
long saved = 1; long saved = 1;
long version = 0; long version = 0;
FILE *fp = NULL;
/* Options. */ /* Options. */
const char* opts = "d:s:v:o:"; const char* opts = "d:s:v:o:";
@ -51,6 +56,7 @@ int main(int argc, char *argv[])
} }
} }
// Save filename required; the point of cheat is to generate save file
if (savefilename == NULL) { if (savefilename == NULL) {
fprintf(stderr, fprintf(stderr,
usage, argv[0]); usage, argv[0]);
@ -59,13 +65,9 @@ int main(int argc, char *argv[])
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
FILE *fp = NULL; // Initialize game variables
/* Initialize game variables */
initialise(); initialise();
make_zzword(game.zzword);
// apply cheats // apply cheats
game.numdie = numdie; game.numdie = numdie;
game.saved = saved; game.saved = saved;
@ -80,5 +82,6 @@ int main(int argc, char *argv[])
savefile(fp, version); savefile(fp, version);
printf("cheat: %s created.\n", savefilename); printf("cheat: %s created.\n", savefilename);
return 0;
return EXIT_SUCCESS;
} }

3
init.c
View file

@ -92,5 +92,8 @@ long initialise(void)
} }
game.conds = setbit(11); game.conds = setbit(11);
/* Start-up, dwarf stuff */
make_zzword(game.zzword);
return seedval; return seedval;
} }

3
main.c
View file

@ -110,9 +110,6 @@ int main(int argc, char *argv[])
/* Initialize game variables */ /* Initialize game variables */
long seedval = initialise(); long seedval = initialise();
/* Start-up, dwarf stuff */
make_zzword(game.zzword);
#ifndef ADVENT_NOSAVE #ifndef ADVENT_NOSAVE
if (!rfp) { if (!rfp) {
game.novice = yes(arbitrary_messages[WELCOME_YOU], arbitrary_messages[CAVE_NEARBY], arbitrary_messages[NO_MESSAGE]); game.novice = yes(arbitrary_messages[WELCOME_YOU], arbitrary_messages[CAVE_NEARBY], arbitrary_messages[NO_MESSAGE]);