X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=main.c;h=498236966c31e1937eac05ce599b5918d8b89c41;hb=4d6078d8a8a8288fd26e7fadcdb46c5e9bd06087;hp=a72d3b55d88211a314a8253212628b42ed950887;hpb=df46df697917304a78ae9d3392ffff9b535ae5a5;p=open-adventure.git

diff --git a/main.c b/main.c
index a72d3b5..4982369 100644
--- a/main.c
+++ b/main.c
@@ -8,16 +8,16 @@
 #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],
 		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,
@@ -26,10 +26,10 @@ long ABBNUM, AMBER, ATTACK, AXE, BACK, BATTER, BEAR, BIRD, BLOOD, BONUS,
 		 DKILL, DOOR, DPRSSN, DRAGON, DSEEN[7], DTOTAL, DWARF, EGGS,
 		EMRALD, ENTER, ENTRNC, FIND, FISSUR, FOOBAR, FOOD,
 		GRATE, HINT, HINTED[21], HINTLC[21],
-		HNTSIZ = 20, I, INVENT, IGO, IWEST, J, JADE, K, K2, KEYS, KK,
+		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,
@@ -38,7 +38,7 @@ long ABBNUM, AMBER, ATTACK, AXE, BACK, BATTER, BEAR, BIRD, BLOOD, BONUS,
 		SCORE, SECT, SIGN, SNAKE, SPK, STEPS, STICK,
 		STREAM, TALLY, THRESH, THROW, TK[21], TRIDNT,
 		TRNDEX, TRNLUZ, TROLL, TROLL2,
-		 TRVSIZ = 885, TURNS, URN, V1, V2, VASE, VEND, VERB,
+		 TURNS, URN, V1, V2, VASE, VEND, VERB,
 		VOLCAN, VRSION = 25, WATER, WD1, WD1X, WD2, WD2X,
 		WZDARK = false, ZZWORD;
 FILE  *logfp;
@@ -109,7 +109,8 @@ int main(int argc, char *argv[]) {
 	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 */
@@ -130,7 +131,7 @@ int main(int argc, char *argv[]) {
 
 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;
@@ -139,7 +140,7 @@ L1:	SETUP= -1;
 
 	if (logfp)
 	    fprintf(logfp, "seed %ld\n", seedval);
-	
+
 	for (;;) {
 	    if (!do_command(stdin))
 		break;
@@ -147,15 +148,17 @@ L1:	SETUP= -1;
 	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;
@@ -233,12 +236,12 @@ L6010:	DTOTAL=0;
 	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;
@@ -399,8 +402,7 @@ L2600:	if(COND[LOC] < CONDS) goto L2603;
 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). */
@@ -528,7 +530,7 @@ L8:	KK=KEY[LOC];
 	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;
@@ -541,7 +543,7 @@ L11:	NEWLOC=LL/1000;
 	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;
@@ -628,11 +630,11 @@ L20:	K=OLDLOC;
 	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;
@@ -642,7 +644,7 @@ L23:	KK=K2;
 	RSPEAK(140);
 	return true;
 
-L25:	K=MOD(IABS(TRAVEL[KK]),1000);
+L25:	K=MOD(labs(TRAVEL[KK]),1000);
 	KK=KEY[LOC];
 	 goto L9;
 
@@ -920,4 +922,5 @@ L12400: LIMIT= -1;
 L18999: RSPEAK(SPK);
 L19000: RSPEAK(136);
 	score(0);
+	return true;
 }