projects
/
open-adventure.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Putting cleanup in the right place, too
[open-adventure.git]
/
cheat.c
diff --git
a/cheat.c
b/cheat.c
index cb20eb7a3f3ac3eea1bcf36e8c4cd48c8b872ec4..d1e45e00a418675a1c50087c7b63d6de24c98a30 100644
(file)
--- a/
cheat.c
+++ b/
cheat.c
@@
-1,19
+1,14
@@
-#define DEFINE_GLOBALS_FROM_INCLUDES
#include <getopt.h>
#include <stdlib.h>
#include <stdio.h>
#include <stdbool.h>
#include <time.h>
#include "advent.h"
#include <getopt.h>
#include <stdlib.h>
#include <stdio.h>
#include <stdbool.h>
#include <time.h>
#include "advent.h"
-#include "database.h"
#include "linenoise/linenoise.h"
#include "linenoise/linenoise.h"
-#include "
newdb
.h"
+#include "
dungeon
.h"
struct game_t game;
struct game_t game;
-long LNLENG, LNPOSN;
-char rawbuf[LINESIZE], INLINE[LINESIZE + 1];
-
FILE *logfp = NULL, *rfp = NULL;
bool oldstyle = false;
bool editline = true;
FILE *logfp = NULL, *rfp = NULL;
bool oldstyle = false;
bool editline = true;
@@
-25,10
+20,11
@@
int main(int argc, char *argv[])
char *savefilename = NULL;
long numdie = 0;
long saved = 1;
char *savefilename = NULL;
long numdie = 0;
long saved = 1;
+ long version = 0;
/* Options. */
/* Options. */
- const char* opts = "d:s:o:";
- const char* usage = "Usage: %s [-d numdie] [-s numsaves] -o savefilename \n";
+ const char* opts = "d:s:
v:
o:";
+ const char* usage = "Usage: %s [-d numdie] [-s numsaves]
[-v version]
-o savefilename \n";
while ((ch = getopt(argc, argv, opts)) != EOF) {
switch (ch) {
case 'd':
while ((ch = getopt(argc, argv, opts)) != EOF) {
switch (ch) {
case 'd':
@@
-37,6
+33,9
@@
int main(int argc, char *argv[])
case 's':
saved = (long)atoi(optarg);
break;
case 's':
saved = (long)atoi(optarg);
break;
+ case 'v':
+ version = (long)atoi(optarg);;
+ break;
case 'o':
savefilename = optarg;
break;
case 'o':
savefilename = optarg;
break;
@@
-47,20
+46,21
@@
int main(int argc, char *argv[])
" -d number of deaths. Signed integer value.'\n");
fprintf(stderr,
" -s number of saves. Signed integer value.\n");
" -d number of deaths. Signed integer value.'\n");
fprintf(stderr,
" -s number of saves. Signed integer value.\n");
+ fprintf(stderr,
+ " -v version number of save format.\n");
fprintf(stderr,
" -o file name of save game to write.\n");
fprintf(stderr,
" -o file name of save game to write.\n");
- exit(
-1
);
+ exit(
EXIT_FAILURE
);
break;
}
}
break;
}
}
-
- if (savefilename == NULL)
- {
+
+ if (savefilename == NULL) {
fprintf(stderr,
usage, argv[0]);
fprintf(stderr,
"ERROR: filename required\n");
fprintf(stderr,
usage, argv[0]);
fprintf(stderr,
"ERROR: filename required\n");
- exit(
-1
);
+ exit(
EXIT_FAILURE
);
}
FILE *fp = NULL;
}
FILE *fp = NULL;
@@
-75,23
+75,24
@@
int main(int argc, char *argv[])
/* Initialize game variables */
initialise();
/* Initialize game variables */
initialise();
-
game.zzword = rndvoc(3, 0
);
+
make_zzword(game.zzword
);
game.newloc = LOC_START;
game.loc = LOC_START;
game.limit = GAMELIMIT;
game.newloc = LOC_START;
game.loc = LOC_START;
game.limit = GAMELIMIT;
-
+
// apply cheats
game.numdie = numdie;
game.saved = saved;
// apply cheats
game.numdie = numdie;
game.saved = saved;
-
+
fp = fopen(savefilename, WRITE_MODE);
fp = fopen(savefilename, WRITE_MODE);
- if (fp == NULL)
- {
- printf("Can't open file %s. Exiting.\n", savefilename);
- exit(-1);
- }
+ if (fp == NULL) {
+ fprintf(stderr,
+ "Can't open file %s. Exiting.\n", savefilename);
+ exit(EXIT_FAILURE);
+ }
+
+ savefile(fp, version);
- savefile(fp);
printf("cheat: %s created.\n", savefilename);
return 0;
}
printf("cheat: %s created.\n", savefilename);
return 0;
}