archives/open-adventure
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Put stuff back in init, C-style

Browse source
This commit is contained in:
NHOrus 2017-07-01 16:45:42 +03:00
parent b3fb636149
commit 8cc5ee5412
3 changed files with 29 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

23
cheat.c
View file

@ -7,26 +7,6 @@
#include "linenoise/linenoise.h" #include "linenoise/linenoise.h"
#include "dungeon.h" #include "dungeon.h"
struct game_t game = {
.dloc[1] = LOC_KINGHALL,
.dloc[2] = LOC_WESTBANK,
.dloc[3] = LOC_Y2,
.dloc[4] = LOC_ALIKE3,
.dloc[5] = LOC_COMPLEX,
/* Sixth dwarf is special (the pirate). He always starts at his
* chest's eventual location inside the maze. This loc is saved
* in chloc for ref. The dead end in the other maze has its
* loc stored in chloc2. */
.dloc[6] = LOC_DEADEND12,
.chloc = LOC_DEADEND12,
.chloc2 = LOC_DEADEND13,
.abbnum = 5,
.clock1 = WARNTIME,
.clock2 = FLASHTIME,
.blklin = true
};
FILE *logfp = NULL, *rfp = NULL; FILE *logfp = NULL, *rfp = NULL;
bool oldstyle = false; bool oldstyle = false;
bool editline = true; bool editline = true;
@ -87,9 +67,6 @@ int main(int argc, char *argv[])
initialise(); initialise();
make_zzword(game.zzword); make_zzword(game.zzword);
game.newloc = LOC_START;
game.loc = LOC_START;
game.limit = GAMELIMIT;
// apply cheats // apply cheats
game.numdie = numdie; game.numdie = numdie;

34
init.c
View file

@ -10,16 +10,40 @@
* Initialisation * Initialisation
*/ */
struct game_t game = {
.dloc[1] = LOC_KINGHALL,
.dloc[2] = LOC_WESTBANK,
.dloc[3] = LOC_Y2,
.dloc[4] = LOC_ALIKE3,
.dloc[5] = LOC_COMPLEX,
/* Sixth dwarf is special (the pirate). He always starts at his
* chest's eventual location inside the maze. This loc is saved
* in chloc for ref. The dead end in the other maze has its
* loc stored in chloc2. */
.dloc[6] = LOC_DEADEND12,
.chloc = LOC_DEADEND12,
.chloc2 = LOC_DEADEND13,
.abbnum = 5,
.clock1 = WARNTIME,
.clock2 = FLASHTIME,
.blklin = true,
.newloc = LOC_START,
.loc = LOC_START,
.limit = GAMELIMIT,
/* Initialize our LCG PRNG with parameters tested against
* Knuth vol. 2. by the original authors */
.lcg_a = 1093,
.lcg_c = 221587,
.lcg_m = 1048576,
};
long initialise(void) long initialise(void)
{ {
if (oldstyle) if (oldstyle)
printf("Initialising...\n"); printf("Initialising...\n");
/* Initialize our LCG PRNG with parameters tested against
* Knuth vol. 2. by the original authors */
game.lcg_a = 1093;
game.lcg_c = 221587;
game.lcg_m = 1048576;
srand(time(NULL)); srand(time(NULL));
long seedval = (long)rand(); long seedval = (long)rand();
set_seed(seedval); set_seed(seedval);

23
main.c
View file

@ -26,26 +26,6 @@
#define DIM(a) (sizeof(a)/sizeof(a[0])) #define DIM(a) (sizeof(a)/sizeof(a[0]))
struct game_t game = {
.dloc[1] = LOC_KINGHALL,
.dloc[2] = LOC_WESTBANK,
.dloc[3] = LOC_Y2,
.dloc[4] = LOC_ALIKE3,
.dloc[5] = LOC_COMPLEX,
/* Sixth dwarf is special (the pirate). He always starts at his
* chest's eventual location inside the maze. This loc is saved
* in chloc for ref. The dead end in the other maze has its
* loc stored in chloc2. */
.dloc[6] = LOC_DEADEND12,
.chloc = LOC_DEADEND12,
.chloc2 = LOC_DEADEND13,
.abbnum = 5,
.clock1 = WARNTIME,
.clock2 = FLASHTIME,
.blklin = true
};
FILE *logfp = NULL, *rfp = NULL; FILE *logfp = NULL, *rfp = NULL;
bool oldstyle = false; bool oldstyle = false;
bool editline = true; bool editline = true;
@ -142,9 +122,6 @@ int main(int argc, char *argv[])
/* Start-up, dwarf stuff */ /* Start-up, dwarf stuff */
make_zzword(game.zzword); make_zzword(game.zzword);
game.newloc = LOC_START;
game.loc = LOC_START;
game.limit = GAMELIMIT;
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]);
if (game.novice) if (game.novice)