projects
/
open-adventure.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
pylint cleanup.
[open-adventure.git]
/
init.c
diff --git
a/init.c
b/init.c
index 0f81fe15cb52e79fdc2692a9e8d9d005f19c9af9..a897936813ae9cab66db2ec3e2223bda52002a98 100644
(file)
--- a/
init.c
+++ b/
init.c
@@
-1,3
+1,11
@@
+/*
+ * Initialisation
+ *
+ * Copyright (c) 1977, 2005 by Will Crowther and Don Woods
+ * Copyright (c) 2017 by Eric S. Raymond
+ * SPDX-License-Identifier: BSD-2-clause
+ */
+
#include <unistd.h>
#include <stdlib.h>
#include <stdio.h>
#include <unistd.h>
#include <stdlib.h>
#include <stdio.h>
@@
-6,9
+14,11
@@
#include "advent.h"
#include "advent.h"
-/*
- * Initialisation
- */
+struct settings_t settings = {
+ .logfp = NULL,
+ .oldstyle = false,
+ .prompt = true
+};
struct game_t game = {
.dloc[1] = LOC_KINGHALL,
struct game_t game = {
.dloc[1] = LOC_KINGHALL,
@@
-21,31
+31,25
@@
struct game_t game = {
* 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. */
* 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_
DEAD
END12,
- .chloc = LOC_
DEAD
END12,
+ .dloc[6] = LOC_
MAZE
END12,
+ .chloc = LOC_
MAZE
END12,
.chloc2 = LOC_DEADEND13,
.abbnum = 5,
.clock1 = WARNTIME,
.clock2 = FLASHTIME,
.chloc2 = LOC_DEADEND13,
.abbnum = 5,
.clock1 = WARNTIME,
.clock2 = FLASHTIME,
- .blklin = true,
.newloc = LOC_START,
.loc = LOC_START,
.limit = GAMELIMIT,
.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,
+ .foobar = WORD_EMPTY,
};
};
-
long
initialise(void)
+
int
initialise(void)
{
{
- if (oldstyle)
+ if (
settings.
oldstyle)
printf("Initialising...\n");
srand(time(NULL));
printf("Initialising...\n");
srand(time(NULL));
-
long seedval = (long
)rand();
+
int seedval = (int
)rand();
set_seed(seedval);
for (int i = 1; i <= NOBJECTS; i++) {
set_seed(seedval);
for (int i = 1; i <= NOBJECTS; i++) {
@@
-53,7
+57,8
@@
long initialise(void)
}
for (int i = 1; i <= NLOCATIONS; i++) {
}
for (int i = 1; i <= NLOCATIONS; i++) {
- if (!(locations[i].description.big == 0 || tkey[i] == 0)) {
+ if (!(locations[i].description.big == 0 ||
+ tkey[i] == 0)) {
int k = tkey[i];
if (T_TERMINATE(travel[k]))
conditions[i] |= (1 << COND_FORCED);
int k = tkey[i];
if (T_TERMINATE(travel[k]))
conditions[i] |= (1 << COND_FORCED);
@@
-86,14
+91,11
@@
long initialise(void)
for (int treasure = 1; treasure <= NOBJECTS; treasure++) {
if (objects[treasure].is_treasure) {
if (objects[treasure].inventory != 0)
for (int treasure = 1; treasure <= NOBJECTS; treasure++) {
if (objects[treasure].is_treasure) {
if (objects[treasure].inventory != 0)
- game.prop[treasure] =
-1
;
+ game.prop[treasure] =
STATE_NOTFOUND
;
game.tally = game.tally - game.prop[treasure];
}
}
game.conds = setbit(11);
game.tally = game.tally - game.prop[treasure];
}
}
game.conds = setbit(11);
- /* Start-up, dwarf stuff */
- make_zzword(game.zzword);
-
return seedval;
}
return seedval;
}