#include <stdbool.h>
#include <getopt.h>
#include <signal.h>
-#include "main.h"
+#include <time.h>
+#include "advent.h"
#include "database.h"
-#include "misc.h"
long ABB[186], ATLOC[186], BLKLIN = true, DFLAG,
- DLOC[7], FIXED[101], HOLDNG,
- LINK[201], LNLENG, LNPOSN,
- PARMS[26], PLACE[101],
+ DLOC[7], FIXED[NOBJECTS+1], HOLDNG,
+ LINK[NOBJECTS*2 + 1], LNLENG, LNPOSN,
+ PARMS[26], PLACE[NOBJECTS+1],
SETUP = 0;
-signed char rawbuf[LINESIZE], INLINE[LINESIZE+1], MAP1[129], MAP2[129];
+char rawbuf[LINESIZE], INLINE[LINESIZE+1], MAP1[129], MAP2[129];
long ABBNUM, AMBER, ATTACK, AXE, BACK, BATTER, BEAR, BIRD, BLOOD, BONUS,
BOTTLE, CAGE, CAVE, CAVITY, CHAIN, CHASM, CHEST, CHLOC, CHLOC2,
CLAM, CLOCK1, CLOCK2, CLOSED, CLOSNG, CLSHNT,
COINS, CONDS, DALTLC, DETAIL,
- DKILL, DOOR, DPRSSN, DRAGON, DSEEN[7], DTOTAL, DWARF, EGGS,
+ DKILL, DOOR, DPRSSN, DRAGON, DSEEN[NDWARVES+1], DTOTAL, DWARF, EGGS,
EMRALD, ENTER, ENTRNC, FIND, FISSUR, FOOBAR, FOOD,
GRATE, HINT, HINTED[21], HINTLC[21],
I, INVENT, IGO, IWEST, J, JADE, K, K2, KEYS, KK,
KNFLOC, KNIFE, KQ, L, LAMP, LIMIT, LL,
LMWARN, LOC, LOCK, LOOK,
- MAGZIN, MAXDIE, MAXTRS, MESH = 123456789,
+ MAGZIN, MAXDIE, MAXTRS,
MESSAG, MIRROR, MXSCOR,
NEWLOC, NOVICE, NUGGET, NUL, NUMDIE, OBJ,
- ODLOC[7], OGRE, OIL, OLDLC2, OLDLOC, OLDOBJ, OYSTER,
- PANIC, PEARL, PILLOW, PLANT, PLANT2, PROP[101], PYRAM,
+ ODLOC[NDWARVES+1], OGRE, OIL, OLDLC2, OLDLOC, OLDOBJ, OYSTER,
+ PANIC, PEARL, PILLOW, PLANT, PLANT2, PROP[NOBJECTS+1], PYRAM,
RESER, ROD, ROD2, RUBY, RUG, SAPPH, SAVED, SAY,
SCORE, SECT, SIGN, SNAKE, SPK, STEPS, STICK,
STREAM, TALLY, THRESH, THROW, TK[21], TRIDNT,
lcgstate.a = 1093;
lcgstate.c = 221587;
lcgstate.m = 1048576;
- long seedval = (long)time(NULL);
+ srand(time(NULL));
+ long seedval = (long)rand();
set_seed(seedval);
/* Read the database if we have not yet done so */
L1: SETUP= -1;
I=0;
- ZZWORD=RNDVOC(3,0)+MESH*2;
+ ZZWORD=RNDVOC(3,0);
NOVICE=YES(stdin, 65,1,0);
NEWLOC=1;
LOC=1;
if (logfp)
fprintf(logfp, "seed %ld\n", seedval);
-
+
for (;;) {
if (!do_command(stdin))
break;
score(1);
}
-static bool fallback_handler(signed char *buf)
+static bool fallback_handler(char *buf)
/* fallback handler for commands not handled by FORTRANish parser */
{
long sv;
if (sscanf(buf, "seed %ld", &sv) == 1) {
set_seed(sv);
printf("Seed set to %ld\n", sv);
+ // autogenerated, so don't charge user time for it.
+ --TURNS;
// here we reconfigure any global game state that uses random numbers
- ZZWORD=RNDVOC(3,0)+MESH*2;
+ ZZWORD=RNDVOC(3,0);
return true;
}
return false;
* (dwarves rooted in place) let him get out (and attacked). */
L71: if(NEWLOC == LOC || FORCED(LOC) || CNDBIT(LOC,3)) goto L74;
- /* 73 */ for (I=1; I<=5; I++) {
+ /* 73 */ for (I=1; I<=NDWARVES-1; I++) {
if(ODLOC[I] != NEWLOC || !DSEEN[I]) goto L73;
NEWLOC=LOC;
RSPEAK(2);
if(!INDEEP(LOC) || (PCT(95) && (!CNDBIT(LOC,4) || PCT(85)))) goto L2000;
DFLAG=2;
for (I=1; I<=2; I++) {
- J=1+randrange(5);
+ J=1+randrange(NDWARVES-1);
if(PCT(50))DLOC[J]=0;
} /* end loop */
- for (I=1; I<=5; I++) {
+ for (I=1; I<=NDWARVES-1; I++) {
if(DLOC[I] == LOC)DLOC[I]=DALTLC;
ODLOC[I]=DLOC[I];
} /* end loop */
L6010: DTOTAL=0;
ATTACK=0;
STICK=0;
- /* 6030 */ for (I=1; I<=6; I++) {
+ /* 6030 */ for (I=1; I<=NDWARVES; I++) {
if(DLOC[I] == 0) goto L6030;
/* Fill TK array with all the places this dwarf might go. */
J=1;
KK=DLOC[I];
KK=KEY[KK];
if(KK == 0) goto L6016;
-L6012: NEWLOC=MOD(IABS(TRAVEL[KK])/1000,1000);
+L6012: NEWLOC=MOD(labs(TRAVEL[KK])/1000,1000);
{long x = J-1;
if(NEWLOC > 300 || !INDEEP(NEWLOC) || NEWLOC == ODLOC[I] || (J > 1 &&
NEWLOC == TK[x]) || J >= 20 || NEWLOC == DLOC[I] ||
FORCED(NEWLOC) || (I == 6 && CNDBIT(NEWLOC,3)) ||
- IABS(TRAVEL[KK])/1000000 == 100) goto L6014;}
+ labs(TRAVEL[KK])/1000000 == 100) goto L6014;}
TK[J]=NEWLOC;
J=J+1;
L6014: KK=KK+1;
I=ATLOC[LOC];
L2004: if(I == 0) goto L2012;
OBJ=I;
- if(OBJ > 100)OBJ=OBJ-100;
+ if(OBJ > NOBJECTS)OBJ=OBJ-NOBJECTS;
if(OBJ == STEPS && TOTING(NUGGET)) goto L2008;
if(PROP[OBJ] >= 0) goto L2006;
if(CLOSED) goto L2008;
L2602: /*etc*/ ;
} /* end loop */
-/* Kick the random number generator just to add variety to the chase. Also,
- * if closing time, check for any objects being toted with PROP < 0 and set
+/* If closing time, check for any objects being toted with PROP < 0 and set
* the prop to -1-PROP. This way objects won't be described until they've
* been picked up and put down separate from their respective piles. Don't
* tick CLOCK1 unless well into cave (and not at Y2). */
L2603: if(!CLOSED) goto L2605;
if(PROP[OYSTER] < 0 && TOTING(OYSTER))PSPEAK(OYSTER,1);
- for (I=1; I<=100; I++) {
+ for (I=1; I<=NOBJECTS; I++) {
if(TOTING(I) && PROP[I] < 0)PROP[I]= -1-PROP[I];
} /* end loop */
L2605: WZDARK=DARK(0);
OLDLC2=OLDLOC;
OLDLOC=LOC;
-L9: LL=IABS(TRAVEL[KK]);
+L9: LL=labs(TRAVEL[KK]);
if(MOD(LL,1000) == 1 || MOD(LL,1000) == K) goto L10;
if(TRAVEL[KK] < 0) goto L50;
KK=KK+1;
L10: LL=LL/1000;
L11: NEWLOC=LL/1000;
- K=MOD(NEWLOC,100);
+ K=MOD(NEWLOC,100); /* ESR: an instance of NOBJECTS? */
if(NEWLOC <= 300) goto L13;
if(PROP[K] != NEWLOC/100-3) goto L16;
L12: if(TRAVEL[KK] < 0)BUG(25);
KK=KK+1;
- NEWLOC=IABS(TRAVEL[KK])/1000;
+ NEWLOC=labs(TRAVEL[KK])/1000;
if(NEWLOC == LL) goto L12;
LL=NEWLOC;
goto L11;
-L13: if(NEWLOC <= 100) goto L14;
+L13: if(NEWLOC <= 100) goto L14; /* ESR: an instance of NOBJECTS? */
if(TOTING(K) || (NEWLOC > 200 && AT(K))) goto L16;
goto L12;
* table must include "useless" entries going through passage, which can never
* be used for actual motion, but can be spotted by "go back". */
-L30100: NEWLOC=99+100-LOC;
+L30100: NEWLOC=99+100-LOC; /* ESR: an instance of NOBJECTS? */
if(HOLDNG == 0 || (HOLDNG == 1 && TOTING(EMRALD))) return true;
NEWLOC=LOC;
RSPEAK(117);
PSPEAK(TROLL,1);
PROP[TROLL]=0;
MOVE(TROLL2,0);
- MOVE(TROLL2+100,0);
+ MOVE(TROLL2+NOBJECTS,0);
MOVE(TROLL,PLAC[TROLL]);
- MOVE(TROLL+100,FIXD[TROLL]);
+ MOVE(TROLL+NOBJECTS,FIXD[TROLL]);
JUGGLE(CHASM);
NEWLOC=LOC;
return true;
RSPEAK(K2);
return true;
-L21: LL=MOD((IABS(TRAVEL[KK])/1000),1000);
+L21: LL=MOD((labs(TRAVEL[KK])/1000),1000);
if(LL == K) goto L25;
if(LL > 300) goto L22;
J=KEY[LL];
- if(FORCED(LL) && MOD((IABS(TRAVEL[J])/1000),1000) == K)K2=KK;
+ if(FORCED(LL) && MOD((labs(TRAVEL[J])/1000),1000) == K)K2=KK;
L22: if(TRAVEL[KK] < 0) goto L23;
KK=KK+1;
goto L21;
RSPEAK(140);
return true;
-L25: K=MOD(IABS(TRAVEL[KK]),1000);
+L25: K=MOD(labs(TRAVEL[KK]),1000);
KK=KEY[LOC];
goto L9;
PLACE[WATER]=0;
PLACE[OIL]=0;
if(TOTING(LAMP))PROP[LAMP]=0;
- /* 98 */ for (J=1; J<=100; J++) {
- I=101-J;
+ /* 98 */ for (J=1; J<=NOBJECTS; J++) {
+ I=NOBJECTS + 1 - J;
if(!TOTING(I)) goto L98;
K=OLDLC2;
if(I == LAMP)K=1;
L10000: PROP[GRATE]=0;
PROP[FISSUR]=0;
- for (I=1; I<=6; I++) {
+ for (I=1; I<=NDWARVES; I++) {
DSEEN[I]=false;
DLOC[I]=0;
} /* end loop */
MOVE(TROLL,0);
- MOVE(TROLL+100,0);
+ MOVE(TROLL+NOBJECTS,0);
MOVE(TROLL2,PLAC[TROLL]);
- MOVE(TROLL2+100,FIXD[TROLL]);
+ MOVE(TROLL2+NOBJECTS,FIXD[TROLL]);
JUGGLE(CHASM);
if(PROP[BEAR] != 3)DSTROY(BEAR);
PROP[CHAIN]=0;
PROP[MIRROR]=PUT(MIRROR,115,0);
FIXED[MIRROR]=116;
- for (I=1; I<=100; I++) {
+ for (I=1; I<=NOBJECTS; I++) {
if(TOTING(I))DSTROY(I);
} /* end loop */
L18999: RSPEAK(SPK);
L19000: RSPEAK(136);
score(0);
+ return true;
}
projects / open-adventure.git / blobdiff