X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;ds=inline;f=main.c;h=a6027f8136e06637db534a1a3df691a0e8384e3e;hb=0a87fc9f78c40354068749f93cbbed80e217cd88;hp=5b65e077b8565fd5b392e89c86beceb414152546;hpb=9714bf8c82c37b1c320e078285fca03d81eea614;p=open-adventure.git diff --git a/main.c b/main.c index 5b65e07..a6027f8 100644 --- a/main.c +++ b/main.c @@ -27,7 +27,25 @@ #define DIM(a) (sizeof(a)/sizeof(a[0])) -struct game_t game; +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; bool oldstyle = false; @@ -371,9 +389,12 @@ static bool dwarfmove(void) if (PCT(50)) game.dloc[j] = 0; } + + /* Alternate initial loc for dwarf, in case one of them + * starts out on top of the adventurer. */ for (int i = 1; i <= NDWARVES - 1; i++) { if (game.dloc[i] == game.loc) - game.dloc[i] = DALTLC; + game.dloc[i] = DALTLC; // game.odloc[i] = game.dloc[i]; } rspeak(DWARF_RAN); @@ -1130,7 +1151,7 @@ Lookup: rspeak(DONT_KNOW, command.wd1, command.wd1x); goto L2600; } - /* FIXME: magic numbers related to vocabulary */ + /* FIXME: magic numbers related to vocabulary */ kmod = MOD(defn, 1000); switch (defn / 1000) { case 0: