X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=main.c;h=de25b32a388cf642e4c34af86cc5886df7dfecd3;hb=dc9d9e467b4efe76c30f15ccd23ceede2326f5e8;hp=c95025a0c205f9c39190d244f5e3a048a5b05c84;hpb=f89f63c6d1a6bc786febc8f22c3ecd8cd3f1f6ae;p=open-adventure.git

diff --git a/main.c b/main.c
index c95025a..de25b32 100644
--- a/main.c
+++ b/main.c
@@ -41,15 +41,18 @@ long ABBNUM, ACTSPK[36], AMBER, ATTACK, AXE, BACK, BATTER, BEAR, BIRD, BLOOD, BO
 		VOLCAN, VRBSIZ = 35, VRSION = 25, WATER, WD1, WD1X, WD2, WD2X,
 		WZDARK = false, ZZWORD;
 FILE  *logfp;
+bool oldstyle = false;
 
 extern void initialise();
 extern void score(long);
-extern int action(long);
+extern int action(FILE *, long);
 
 /*
  * MAIN PROGRAM
  */
 
+static void do_command(FILE *);
+
 int main(int argc, char *argv[]) {
 	int ch;
 
@@ -63,7 +66,7 @@ int main(int argc, char *argv[]) {
 
 /*  Options. */
 
-	while ((ch = getopt(argc, argv, "l:")) != EOF) {
+	while ((ch = getopt(argc, argv, "l:o")) != EOF) {
 		switch (ch) {
 		case 'l':
 			logfp = fopen(optarg, "w+");
@@ -72,6 +75,9 @@ int main(int argc, char *argv[]) {
 					"advent: can't open logfile %s for write\n",
 					optarg);
 			break;
+		case 'o':
+		    oldstyle = true;
+		    break;
 		}
 	}
 
@@ -112,12 +118,19 @@ int main(int argc, char *argv[]) {
 L1:	SETUP= -1;
 	I=RAN(-1);
 	ZZWORD=RNDVOC(3,0)+MESH*2;
-	NOVICE=YES(65,1,0);
+	NOVICE=YES(stdin, 65,1,0);
 	NEWLOC=1;
 	LOC=1;
 	LIMIT=330;
 	if(NOVICE)LIMIT=1000;
 
+	for (;;) {
+	    do_command(stdin);
+	}
+}
+
+static void do_command(FILE *cmdin) {
+
 /*  Can't leave cave once it's closing (except by main office). */
 
 L2:	if(!OUTSID(NEWLOC) || NEWLOC == 0 || !CLOSNG) goto L71;
@@ -368,7 +381,7 @@ L2603:	if(!CLOSED) goto L2605;
 L2605:	WZDARK=DARK(0);
 	if(KNFLOC > 0 && KNFLOC != LOC)KNFLOC=0;
 	I=RAN(1);
-	GETIN(WD1,WD1X,WD2,WD2X);
+	GETIN(cmdin, WD1,WD1X,WD2,WD2X);
 
 /*  Every input, check "FOOBAR" flag.  If zero, nothing's going on.  If pos,
  *  make neg.  If neg, he skipped a word, so make it zero. */
@@ -436,8 +449,8 @@ L4000:	I=4000; goto Laction;
 L4090:	I=4090; goto Laction;
 L5000:	I=5000;
 Laction:
-	switch (action(I)) {
-	   case 2: goto L2;
+	 switch (action(cmdin, I)) {
+	   case 2: return;
 	   case 8: goto L8;
 	   case 2000: goto L2000;
 	   case 2009: goto L2009;
@@ -473,7 +486,7 @@ L8000:	SETPRM(1,WD1,WD1X);
 L8:	KK=KEY[LOC];
 	NEWLOC=LOC;
 	if(KK == 0)BUG(26);
-	if(K == NUL) goto L2;
+	if(K == NUL) return;
 	if(K == BACK) goto L20;
 	if(K == LOOK) goto L30;
 	if(K == CAVE) goto L40;
@@ -504,11 +517,11 @@ L13:	if(NEWLOC <= 100) goto L14;
 
 L14:	if(NEWLOC != 0 && !PCT(NEWLOC)) goto L12;
 L16:	NEWLOC=MOD(LL,1000);
-	if(NEWLOC <= 300) goto L2;
+	if(NEWLOC <= 300) return;
 	if(NEWLOC <= 500) goto L30000;
 	RSPEAK(NEWLOC-500);
 	NEWLOC=LOC;
-	 goto L2;
+	 return;
 
 /*  Special motions come here.  Labelling convention: statement numbers NNNXX
  *  (XX=00-99) are used for special case number NNN (NNN=301-500). */
@@ -523,10 +536,10 @@ L30000: NEWLOC=NEWLOC-300;
  *  be used for actual motion, but can be spotted by "go back". */
 
 L30100: NEWLOC=99+100-LOC;
-	if(HOLDNG == 0 || (HOLDNG == 1 && TOTING(EMRALD))) goto L2;
+	if(HOLDNG == 0 || (HOLDNG == 1 && TOTING(EMRALD))) return;
 	NEWLOC=LOC;
 	RSPEAK(117);
-	 goto L2;
+	 return;
 
 /*  Travel 302.  Plover transport.  Drop the emerald (only use special travel if
  *  toting it), so he's forced to use the plover-passage to get it out.  Having
@@ -550,11 +563,11 @@ L30300: if(PROP[TROLL] != 1) goto L30310;
 	MOVE(TROLL+100,FIXD[TROLL]);
 	JUGGLE(CHASM);
 	NEWLOC=LOC;
-	 goto L2;
+	 return;
 
 L30310: NEWLOC=PLAC[TROLL]+FIXD[TROLL]-LOC;
 	if(PROP[TROLL] == 0)PROP[TROLL]=1;
-	if(!TOTING(BEAR)) goto L2;
+	if(!TOTING(BEAR)) return;
 	RSPEAK(162);
 	PROP[CHASM]=1;
 	PROP[TROLL]=2;
@@ -578,7 +591,7 @@ L20:	K=OLDLOC;
 	if(CNDBIT(LOC,4))K2=274;
 	if(K2 == 0) goto L21;
 	RSPEAK(K2);
-	 goto L2;
+	 return;
 
 L21:	LL=MOD((IABS(TRAVEL[KK])/1000),1000);
 	if(LL == K) goto L25;
@@ -592,7 +605,7 @@ L22:	if(TRAVEL[KK] < 0) goto L23;
 L23:	KK=K2;
 	if(KK != 0) goto L25;
 	RSPEAK(140);
-	 goto L2;
+	 return;
 
 L25:	K=MOD(IABS(TRAVEL[KK]),1000);
 	KK=KEY[LOC];
@@ -605,14 +618,14 @@ L30:	if(DETAIL < 3)RSPEAK(15);
 	DETAIL=DETAIL+1;
 	WZDARK=false;
 	ABB[LOC]=0;
-	 goto L2;
+	 return;
 
 /*  Cave.  Different messages depending on whether above ground. */
 
 L40:	K=58;
 	if(OUTSID(LOC) && LOC != 8)K=57;
 	RSPEAK(K);
-	 goto L2;
+	 return;
 
 /*  Non-applicable motion.  Various messages depending on word given. */
 
@@ -625,7 +638,7 @@ L50:	SPK=12;
 	if(K == 62 || K == 65)SPK=42;
 	if(K == 17)SPK=80;
 	RSPEAK(SPK);
-	 goto L2;
+	 return;
 
 
 
@@ -657,7 +670,7 @@ L90:	RSPEAK(23);
 
 L99:	if(CLOSNG) goto L95;
 	NUMDIE=NUMDIE+1;
-	if(!YES(79+NUMDIE*2,80+NUMDIE*2,54)) score(0);
+	if(!YES(cmdin,79+NUMDIE*2,80+NUMDIE*2,54)) score(0);
 	if(NUMDIE == MAXDIE) score(0);
 	PLACE[WATER]=0;
 	PLACE[OIL]=0;
@@ -700,10 +713,10 @@ L40000:    switch (HINT-1) { case 0: goto L40100; case 1: goto L40200; case 2: g
 	BUG(27);
 
 L40010: HINTLC[HINT]=0;
-	if(!YES(HINTS[HINT][3],0,54)) goto L2602;
+	if(!YES(cmdin,HINTS[HINT][3],0,54)) goto L2602;
 	SETPRM(1,HINTS[HINT][2],HINTS[HINT][2]);
 	RSPEAK(261);
-	HINTED[HINT]=YES(175,HINTS[HINT][4],54);
+	HINTED[HINT]=YES(cmdin,175,HINTS[HINT][4],54);
 	if(HINTED[HINT] && LIMIT > 30)LIMIT=LIMIT+30*HINTS[HINT][2];
 L40020: HINTLC[HINT]=0;
 L40030:  goto L2602;
@@ -843,7 +856,7 @@ L11000: PROP[BOTTLE]=PUT(BOTTLE,115,1);
 
 	RSPEAK(132);
 	CLOSED=true;
-	 goto L2;
+	 return;
 
 /*  Another way we can force an end to things is by having the lamp give out.
  *  When it gets close, we come here to warn him.  We go to 12000 if the lamp