X-Git-Url: https://jxself.org/git/?p=open-adventure.git;a=blobdiff_plain;f=main.c;h=d93c9671f518d1451b1fe55e962bcc2b554562e6;hp=71d61c9f08d72e088f270c0c7124250e2e57e94d;hb=65c081a0acc24707915a2abf80ef64ed70e50f45;hpb=484ca4e9fd956e431c64d0465dbacd59215d23e4

diff --git a/main.c b/main.c
index 71d61c9..d93c967 100644
--- a/main.c
+++ b/main.c
@@ -7,6 +7,7 @@
 #include <stdio.h>
 #include <stdbool.h>
 #include <getopt.h>
+#include <string.h>
 #include "main.h"
 
 #include "misc.h"
@@ -17,6 +18,7 @@ long ABB[186], ATAB[331], ATLOC[186], BLKLIN = true, DFLAG,
 		PARMS[26], PLACE[101], PTEXT[101], RTEXT[278],
 		SETUP = 0, TABSIZ = 330;
 signed char INLINE[LINESIZE+1], MAP1[129], MAP2[129];
+signed char raw_input[LINESIZE+1];
 
 long ABBNUM, ACTSPK[36], AMBER, ATTACK, AXE, BACK, BATTER, BEAR, BIRD, BLOOD, BONUS,
 		 BOTTLE, CAGE, CAVE, CAVITY, CHAIN, CHASM, CHEST, CHLOC, CHLOC2,
@@ -42,6 +44,7 @@ long ABBNUM, ACTSPK[36], AMBER, ATTACK, AXE, BACK, BATTER, BEAR, BIRD, BLOOD, BO
 		WZDARK = false, ZZWORD;
 FILE  *logfp;
 bool oldstyle = false;
+lcg_state lcgstate;
 
 extern void initialise();
 extern void score(long);
@@ -93,6 +96,13 @@ int main(int argc, char *argv[]) {
 
 #include "funcs.h"
 
+/* Initialize our LCG PRNG with parameters tested against Knuth vol. 2. by the original authors */
+
+	lcgstate.a = 1093;
+	lcgstate.c = 221587;
+	lcgstate.m = 1048576;
+	set_seed_from_time();
+
 /*  Read the database if we have not yet done so */
 
 	LINES = (long *)calloc(LINSIZ+1,sizeof(long));
@@ -116,7 +126,7 @@ int main(int argc, char *argv[]) {
 /*  Start-up, dwarf stuff */
 
 L1:	SETUP= -1;
-	I=RAN(-1);
+	I=0;
 	ZZWORD=RNDVOC(3,0)+MESH*2;
 	NOVICE=YES(stdin, 65,1,0);
 	NEWLOC=1;
@@ -175,7 +185,7 @@ L6000:	if(DFLAG != 1) goto L6010;
 	if(!INDEEP(LOC) || (PCT(95) && (!CNDBIT(LOC,4) || PCT(85)))) goto L2000;
 	DFLAG=2;
 	for (I=1; I<=2; I++) {
-	J=1+RAN(5);
+	J=1+randrange(5);
 	if(PCT(50))DLOC[J]=0;
 	} /* end loop */
 	for (I=1; I<=5; I++) {
@@ -213,7 +223,7 @@ L6014:	KK=KK+1;
 	{long x = KK-1; if(TRAVEL[x] >= 0) goto L6012;}
 L6016:	TK[J]=ODLOC[I];
 	if(J >= 2)J=J-1;
-	J=1+RAN(J);
+	J=1+randrange(J);
 	ODLOC[I]=DLOC[I];
 	DLOC[I]=TK[J];
 	DSEEN[I]=(DSEEN[I] && INDEEP(LOC)) || (DLOC[I] == LOC || ODLOC[I] == LOC);
@@ -266,7 +276,7 @@ L6027:	DTOTAL=DTOTAL+1;
 	if(ODLOC[I] != DLOC[I]) goto L6030;
 	ATTACK=ATTACK+1;
 	if(KNFLOC >= 0)KNFLOC=LOC;
-	if(RAN(1000) < 95*(DFLAG-2))STICK=STICK+1;
+	if(randrange(1000) < 95*(DFLAG-2))STICK=STICK+1;
 L6030:	/*etc*/ ;
 	} /* end loop */
 
@@ -380,7 +390,7 @@ L2603:	if(!CLOSED) goto L2605;
 	} /* end loop */
 L2605:	WZDARK=DARK(0);
 	if(KNFLOC > 0 && KNFLOC != LOC)KNFLOC=0;
-	I=RAN(1);
+	I=0;
 	GETIN(cmdin, WD1,WD1X,WD2,WD2X);
 
 /*  Every input, check "FOOBAR" flag.  If zero, nothing's going on.  If pos,
@@ -440,8 +450,19 @@ L2800:	WD1=WD2;
 /*  Gee, I don't understand. */
 
 L3000:	SETPRM(1,WD1,WD1X);
-	RSPEAK(254);
-	 goto L2600;
+	 /* This is a kludge. The command parser we inherited from the base 2.5
+	  * barfs on numeric tokens. It will fall through to here when it sees
+	  * seed NNNN. Instead of barfing, go straight to the action processor
+	  * where it will examine the raw input. This will fo away when we get
+	  * rid of the obfuscated FORTRANoid input processing.
+	  */
+	 if (strncmp(raw_input, "seed", 4) == 0) {
+	     I=4090; K=34;
+	     goto Laction;
+	 } else {
+	     RSPEAK(254);
+	     goto L2600;
+	 }
 
 /* Verb and object analysis moved to separate module. */