projects
/
open-adventure.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Complain to user on save/resume.restore when it's disabled.
[open-adventure.git]
/
init.c
diff --git
a/init.c
b/init.c
index b3f984d049d2fe6867e6af49ba01546fa5d2cd09..9333df3be8e90d6a7549447cd565e6da20e4f57d 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,10
+14,6
@@
#include "advent.h"
#include "advent.h"
-/*
- * Initialisation
- */
-
struct settings_t settings = {
.logfp = NULL,
.oldstyle = false,
struct settings_t settings = {
.logfp = NULL,
.oldstyle = false,
@@
-27,8
+31,8
@@
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,
.chloc2 = LOC_DEADEND13,
.abbnum = 5,
.clock1 = WARNTIME,
@@
-36,21
+40,16
@@
struct game_t game = {
.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 (settings.oldstyle)
printf("Initialising...\n");
srand(time(NULL));
{
if (settings.oldstyle)
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++) {
@@
-61,7
+60,7
@@
long initialise(void)
if (!(locations[i].description.big == 0 ||
tkey[i] == 0)) {
int k = tkey[i];
if (!(locations[i].description.big == 0 ||
tkey[i] == 0)) {
int k = tkey[i];
- if (
T_TERMINATE(travel[k])
)
+ if (
travel[k].motion == HERE
)
conditions[i] |= (1 << COND_FORCED);
}
}
conditions[i] |= (1 << COND_FORCED);
}
}