X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=init.c;h=9333df3be8e90d6a7549447cd565e6da20e4f57d;hb=67a887f432fa175300e6d51069587175dee76e17;hp=4ff52a83d9f8b8a64242ddea7ef565acaf5f23bd;hpb=782c5c3f290555fa9368208efdb3b428f45468eb;p=open-adventure.git diff --git a/init.c b/init.c index 4ff52a8..9333df3 100644 --- a/init.c +++ b/init.c @@ -31,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. */ - .dloc[6] = LOC_DEADEND12, - .chloc = LOC_DEADEND12, + .dloc[6] = LOC_MAZEEND12, + .chloc = LOC_MAZEEND12, .chloc2 = LOC_DEADEND13, .abbnum = 5, .clock1 = WARNTIME, @@ -43,13 +43,13 @@ struct game_t game = { .foobar = WORD_EMPTY, }; -long initialise(void) +int initialise(void) { 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++) { @@ -60,7 +60,7 @@ long initialise(void) 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); } }