X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=actions1.c;h=7f00bdabb1462da9152f9dab1684657149811bb6;hb=7f4cff11889363b959a9987e92c9f62244397574;hp=c64291c4073d4dc8477f1c52b5db4211d3b692ef;hpb=7e5448e9740f211771262dbd4870aedf88c8f3a4;p=open-adventure.git

diff --git a/actions1.c b/actions1.c
index c64291c..7f00bda 100644
--- a/actions1.c
+++ b/actions1.c
@@ -1,9 +1,8 @@
 #include <stdlib.h>
 #include <stdbool.h>
-#include "misc.h"
-#include "main.h"
-#include "share.h"
+#include "advent.h"
 #include "funcs.h"
+#include "database.h"
 
 /* This stuff was broken off as part of an effort to get the main program
  * to compile without running out of memory.  We're called with a number
@@ -23,7 +22,7 @@ int action(FILE *input, long STARTAT) {
 	BUG(99);
 
 L4000:	VERB=K;
-	game.spk=ACTSPK[VERB];
+	SPK=ACTSPK[VERB];
 	if(WD2 > 0 && VERB != SAY) return(2800);
 	if(VERB == SAY)OBJ=WD2;
 	if(OBJ > 0) goto L4090;
@@ -136,7 +135,7 @@ L5120:	if(OBJ != PLANT || !AT(PLANT2) || PROP[PLANT2] == 0) goto L5130;
 	 goto L5010;
 L5130:	if(OBJ != KNIFE || game.knfloc != LOC) goto L5140;
 	game.knfloc= -1;
-	game.spk=116;
+	SPK=116;
 	 return(2011);
 L5140:	if(OBJ != ROD || !HERE(ROD2)) goto L5190;
 	OBJ=ROD2;
@@ -181,7 +180,7 @@ L9035:	WD2=0;
 
 /*  Lock, unlock, no object given.  Assume various things if present. */
 
-L8040:	game.spk=28;
+L8040:	SPK=28;
 	if(HERE(CLAM))OBJ=CLAM;
 	if(HERE(OYSTER))OBJ=OYSTER;
 	if(AT(DOOR))OBJ=DOOR;
@@ -193,12 +192,12 @@ L8040:	game.spk=28;
 /*  Lock, unlock object.  Special stuff for opening clam/oyster and for chain. */
 
 L9040:	if(OBJ == CLAM || OBJ == OYSTER) goto L9046;
-	if(OBJ == DOOR)game.spk=111;
-	if(OBJ == DOOR && PROP[DOOR] == 1)game.spk=54;
-	if(OBJ == CAGE)game.spk=32;
-	if(OBJ == KEYS)game.spk=55;
-	if(OBJ == GRATE || OBJ == CHAIN)game.spk=31;
-	if(game.spk != 31 || !HERE(KEYS)) return(2011);
+	if(OBJ == DOOR)SPK=111;
+	if(OBJ == DOOR && PROP[DOOR] == 1)SPK=54;
+	if(OBJ == CAGE)SPK=32;
+	if(OBJ == KEYS)SPK=55;
+	if(OBJ == GRATE || OBJ == CHAIN)SPK=31;
+	if(SPK != 31 || !HERE(KEYS)) return(2011);
 	if(OBJ == CHAIN) goto L9048;
 	if(!game.closng) goto L9043;
 	K=130;
@@ -215,11 +214,11 @@ L9043:	K=34+PROP[GRATE];
 /*  Clam/Oyster. */
 L9046:	K=0;
 	if(OBJ == OYSTER)K=1;
-	game.spk=124+K;
-	if(TOTING(OBJ))game.spk=120+K;
-	if(!TOTING(TRIDNT))game.spk=122+K;
-	if(VERB == LOCK)game.spk=61;
-	if(game.spk != 124) return(2011);
+	SPK=124+K;
+	if(TOTING(OBJ))SPK=120+K;
+	if(!TOTING(TRIDNT))SPK=122+K;
+	if(VERB == LOCK)SPK=61;
+	if(SPK != 124) return(2011);
 	DSTROY(CLAM);
 	DROP(OYSTER,LOC);
 	DROP(PEARL,105);
@@ -227,20 +226,20 @@ L9046:	K=0;
 
 /*  Chain. */
 L9048:	if(VERB == LOCK) goto L9049;
-	game.spk=171;
-	if(PROP[BEAR] == 0)game.spk=41;
-	if(PROP[CHAIN] == 0)game.spk=37;
-	if(game.spk != 171) return(2011);
+	SPK=171;
+	if(PROP[BEAR] == 0)SPK=41;
+	if(PROP[CHAIN] == 0)SPK=37;
+	if(SPK != 171) return(2011);
 	PROP[CHAIN]=0;
 	FIXED[CHAIN]=0;
 	if(PROP[BEAR] != 3)PROP[BEAR]=2;
 	FIXED[BEAR]=2-PROP[BEAR];
 	 return(2011);
 
-L9049:	game.spk=172;
-	if(PROP[CHAIN] != 0)game.spk=34;
-	if(LOC != PLAC[CHAIN])game.spk=173;
-	if(game.spk != 172) return(2011);
+L9049:	SPK=172;
+	if(PROP[CHAIN] != 0)SPK=34;
+	if(LOC != PLAC[CHAIN])SPK=173;
+	if(SPK != 172) return(2011);
 	PROP[CHAIN]=2;
 	if(TOTING(CHAIN))DROP(CHAIN,LOC);
 	FIXED[CHAIN]= -1;
@@ -249,37 +248,37 @@ L9049:	game.spk=172;
 /*  Light.  Applicable only to lamp and urn. */
 
 L8070:	if(HERE(LAMP) && PROP[LAMP] == 0 && game.limit >= 0)OBJ=LAMP;
-	if(HERE(URN) && PROP[URN] == 1)OBJ=OBJ*100+URN;
-	if(OBJ == 0 || OBJ > 100) return(8000);
+	if(HERE(URN) && PROP[URN] == 1)OBJ=OBJ*NOBJECTS+URN;
+	if(OBJ == 0 || OBJ > NOBJECTS) return(8000);
 
 L9070:	if(OBJ == URN) goto L9073;
 	if(OBJ != LAMP) return(2011);
-	game.spk=184;
+	SPK=184;
 	if(game.limit < 0) return(2011);
 	PROP[LAMP]=1;
 	RSPEAK(39);
 	if(game.wzdark) return(2000);
 	 return(2012);
 
-L9073:	game.spk=38;
+L9073:	SPK=38;
 	if(PROP[URN] == 0) return(2011);
-	game.spk=209;
+	SPK=209;
 	PROP[URN]=2;
 	 return(2011);
 
 /*  Extinguish.  Lamp, urn, dragon/volcano (nice try). */
 
 L8080:	if(HERE(LAMP) && PROP[LAMP] == 1)OBJ=LAMP;
-	if(HERE(URN) && PROP[URN] == 2)OBJ=OBJ*100+URN;
-	if(OBJ == 0 || OBJ > 100) return(8000);
+	if(HERE(URN) && PROP[URN] == 2)OBJ=OBJ*NOBJECTS+URN;
+	if(OBJ == 0 || OBJ > NOBJECTS) return(8000);
 
 L9080:	if(OBJ == URN) goto L9083;
 	if(OBJ == LAMP) goto L9086;
-	if(OBJ == DRAGON || OBJ == VOLCAN)game.spk=146;
+	if(OBJ == DRAGON || OBJ == VOLCAN)SPK=146;
 	 return(2011);
 
 L9083:	PROP[URN]=PROP[URN]/2;
-	game.spk=210;
+	SPK=210;
 	 return(2011);
 
 L9086:	PROP[LAMP]=0;
@@ -289,14 +288,14 @@ L9086:	PROP[LAMP]=0;
 
 /*  Wave.  No effect unless waving rod at fissure or at bird. */
 
-L9090:	if((!TOTING(OBJ)) && (OBJ != ROD || !TOTING(ROD2)))game.spk=29;
+L9090:	if((!TOTING(OBJ)) && (OBJ != ROD || !TOTING(ROD2)))SPK=29;
 	if(OBJ != ROD || !TOTING(OBJ) || (!HERE(BIRD) && (game.closng || !AT(FISSUR))))
 		return(2011);
-	if(HERE(BIRD))game.spk=206+MOD(PROP[BIRD],2);
-	if(game.spk == 206 && LOC == PLACE[STEPS] && PROP[JADE] < 0) goto L9094;
+	if(HERE(BIRD))SPK=206+MOD(PROP[BIRD],2);
+	if(SPK == 206 && LOC == PLACE[STEPS] && PROP[JADE] < 0) goto L9094;
 	if(game.closed) return(18999);
 	if(game.closng || !AT(FISSUR)) return(2011);
-	if(HERE(BIRD))RSPEAK(game.spk);
+	if(HERE(BIRD))RSPEAK(SPK);
 	PROP[FISSUR]=1-PROP[FISSUR];
 	PSPEAK(FISSUR,2-PROP[FISSUR]);
 	 return(2012);
@@ -304,7 +303,7 @@ L9090:	if((!TOTING(OBJ)) && (OBJ != ROD || !TOTING(ROD2)))game.spk=29;
 L9094:	DROP(JADE,LOC);
 	PROP[JADE]=0;
 	game.tally=game.tally-1;
-	game.spk=208;
+	SPK=208;
 	 return(2011);
 
 /*  Attack also moved into separate module. */
@@ -317,16 +316,16 @@ L9120:	return(attack(input));
 L9130:	if(OBJ == BOTTLE || OBJ == 0)OBJ=LIQ(0);
 	if(OBJ == 0) return(8000);
 	if(!TOTING(OBJ)) return(2011);
-	game.spk=78;
+	SPK=78;
 	if(OBJ != OIL && OBJ != WATER) return(2011);
 	if(HERE(URN) && PROP[URN] == 0) goto L9134;
 	PROP[BOTTLE]=1;
 	PLACE[OBJ]=0;
-	game.spk=77;
+	SPK=77;
 	if(!(AT(PLANT) || AT(DOOR))) return(2011);
 
 	if(AT(DOOR)) goto L9132;
-	game.spk=112;
+	SPK=112;
 	if(OBJ != WATER) return(2011);
 	PSPEAK(PLANT,PROP[PLANT]+3);
 	PROP[PLANT]=MOD(PROP[PLANT]+1,3);
@@ -336,7 +335,7 @@ L9130:	if(OBJ == BOTTLE || OBJ == 0)OBJ=LIQ(0);
 
 L9132:	PROP[DOOR]=0;
 	if(OBJ == OIL)PROP[DOOR]=1;
-	game.spk=113+PROP[DOOR];
+	SPK=113+PROP[DOOR];
 	 return(2011);
 
 L9134:	OBJ=URN;
@@ -347,13 +346,13 @@ L9134:	OBJ=URN;
 
 L8140:	if(!HERE(FOOD)) return(8000);
 L8142:	DSTROY(FOOD);
-	game.spk=72;
+	SPK=72;
 	 return(2011);
 
 L9140:	if(OBJ == FOOD) goto L8142;
 	if(OBJ == BIRD || OBJ == SNAKE || OBJ == CLAM || OBJ == OYSTER || OBJ ==
 		DWARF || OBJ == DRAGON || OBJ == TROLL || OBJ == BEAR || OBJ ==
-		OGRE)game.spk=71;
+		OGRE)SPK=71;
 	 return(2011);
 
 /*  Drink.  If no object, assume water and look for it here.  If water is in
@@ -362,29 +361,29 @@ L9140:	if(OBJ == FOOD) goto L8142;
 L9150:	if(OBJ == 0 && LIQLOC(LOC) != WATER && (LIQ(0) != WATER || !HERE(BOTTLE)))
 		return(8000);
 	if(OBJ == BLOOD) goto L9153;
-	if(OBJ != 0 && OBJ != WATER)game.spk=110;
-	if(game.spk == 110 || LIQ(0) != WATER || !HERE(BOTTLE)) return(2011);
+	if(OBJ != 0 && OBJ != WATER)SPK=110;
+	if(SPK == 110 || LIQ(0) != WATER || !HERE(BOTTLE)) return(2011);
 	PROP[BOTTLE]=1;
 	PLACE[WATER]=0;
-	game.spk=74;
+	SPK=74;
 	 return(2011);
 
 L9153:	DSTROY(BLOOD);
 	PROP[DRAGON]=2;
 	OBJSND[BIRD]=OBJSND[BIRD]+3;
-	game.spk=240;
+	SPK=240;
 	 return(2011);
 
 /*  Rub.  Yields various snide remarks except for lit urn. */
 
-L9160:	if(OBJ != LAMP)game.spk=76;
+L9160:	if(OBJ != LAMP)SPK=76;
 	if(OBJ != URN || PROP[URN] != 2) return(2011);
 	DSTROY(URN);
 	DROP(AMBER,LOC);
 	PROP[AMBER]=1;
 	game.tally=game.tally-1;
 	DROP(CAVITY,LOC);
-	game.spk=216;
+	SPK=216;
 	 return(2011);
 
 /*  Throw moved into separate module. */
@@ -399,24 +398,24 @@ L8180:	if(YES(input,22,54,54)) score(1);
 /*  Find.  Might be carrying it, or it might be here.  Else give caveat. */
 
 L9190:	if(AT(OBJ) || (LIQ(0) == OBJ && AT(BOTTLE)) || K == LIQLOC(LOC) || (OBJ ==
-		DWARF && ATDWRF(LOC) > 0))game.spk=94;
-	if(game.closed)game.spk=138;
-	if(TOTING(OBJ))game.spk=24;
+		DWARF && ATDWRF(LOC) > 0))SPK=94;
+	if(game.closed)SPK=138;
+	if(TOTING(OBJ))SPK=24;
 	 return(2011);
 
 /*  Inventory.  If object, treat same as find.  Else report on current burden. */
 
-L8200:	game.spk=98;
-	/* 8201 */ for (I=1; I<=100; I++) {
+L8200:	SPK=98;
+	/* 8201 */ for (I=1; I<=NOBJECTS; I++) {
 	if(I == BEAR || !TOTING(I)) goto L8201;
-	if(game.spk == 98)RSPEAK(99);
+	if(SPK == 98)RSPEAK(99);
 	game.blklin=false;
 	PSPEAK(I,-1);
 	game.blklin=true;
-	game.spk=0;
+	SPK=0;
 L8201:	/*etc*/ ;
 	} /* end loop */
-	if(TOTING(BEAR))game.spk=141;
+	if(TOTING(BEAR))SPK=141;
 	 return(2011);
 
 /* Feed/fill are in the other module. */
@@ -446,9 +445,9 @@ L8240:	score(-1);
  *  WORD ZIPS THE EGGS BACK TO THE GIANT ROOM (UNLESS ALREADY THERE). */
 
 L8250:	K=VOCAB(WD1,3);
-	game.spk=42;
+	SPK=42;
 	if(game.foobar == 1-K) goto L8252;
-	if(game.foobar != 0)game.spk=151;
+	if(game.foobar != 0)SPK=151;
 	 return(2011);
 
 L8252:	game.foobar=K;
@@ -468,36 +467,36 @@ L8252:	game.foobar=K;
 
 /*  Brief.  Intransitive only.  Suppress long descriptions after first time. */
 
-L8260:	game.spk=156;
+L8260:	SPK=156;
 	game.abbnum=10000;
 	game.detail=3;
 	 return(2011);
 
 /*  Read.  Print stuff based on objtxt.  Oyster (?) is special case. */
 
-L8270:	for (I=1; I<=100; I++) {
-	if(HERE(I) && OBJTXT[I] != 0 && PROP[I] >= 0)OBJ=OBJ*100+I;
+L8270:	for (I=1; I<=NOBJECTS; I++) {
+	if(HERE(I) && OBJTXT[I] != 0 && PROP[I] >= 0)OBJ=OBJ*NOBJECTS+I;
 	} /* end loop */
-	if(OBJ > 100 || OBJ == 0 || DARK(0)) return(8000);
+	if(OBJ > NOBJECTS || OBJ == 0 || DARK(0)) return(8000);
 
 L9270:	if(DARK(0)) goto L5190;
 	if(OBJTXT[OBJ] == 0 || PROP[OBJ] < 0) return(2011);
-	if(OBJ == OYSTER && !game.clshint) goto L9275;
+	if(OBJ == OYSTER && !game.clshnt) goto L9275;
 	PSPEAK(OBJ,OBJTXT[OBJ]+PROP[OBJ]);
 	 return(2012);
 
-L9275:	game.clshint=YES(input,192,193,54);
+L9275:	game.clshnt=YES(input,192,193,54);
 	 return(2012);
 
 /*  Break.  Only works for mirror in repository and, of course, the vase. */
 
-L9280:	if(OBJ == MIRROR)game.spk=148;
+L9280:	if(OBJ == MIRROR)SPK=148;
 	if(OBJ == VASE && PROP[VASE] == 0) goto L9282;
 	if(OBJ != MIRROR || !game.closed) return(2011);
-	game.spk=197;
+	SPK=197;
 	 return(18999);
 
-L9282:	game.spk=198;
+L9282:	SPK=198;
 	if(TOTING(VASE))DROP(VASE,LOC);
 	PROP[VASE]=2;
 	FIXED[VASE]= -1;
@@ -506,14 +505,14 @@ L9282:	game.spk=198;
 /*  Wake.  Only use is to disturb the dwarves. */
 
 L9290:	if(OBJ != DWARF || !game.closed) return(2011);
-	game.spk=199;
+	SPK=199;
 	 return(18999);
 
 /*  Suspend.  Offer to save things in a file, but charging some points (so
  *  can't win by using saved games to retry battles or to start over after
  *  learning zzword). */
 
-L8300:	game.spk=201;
+L8300:	SPK=201;
 	RSPEAK(260);
 	if(!YES(input,200,54,54)) return(2012);
 	game.saved=game.saved+5;
@@ -522,7 +521,7 @@ L8300:	game.spk=201;
 /*  This next part is shared with the "resume" code.  The two cases are
  *  distinguished by the value of kk (-1 for suspend, +1 for resume). */
 
-L8305:	DATIME(I,K);
+L8305:	DATIME(&I,&K);
 	K=I+650*K;
 	SAVWRD(KK,K);
 	K=VRSION;
@@ -538,24 +537,24 @@ L8305:	DATIME(I,K);
 	SAVWDS(game.detail,game.dflag,game.dkill,game.dtotal,game.foobar,game.holdng,game.iwest);
 	SAVWDS(game.knfloc,game.limit,LL,game.lmwarn,LOC,game.newloc,game.numdie);
 	SAVWDS(OBJ,game.oldlc2,game.oldloc,game.oldobj,game.panic,game.saved,game.setup);
-	SAVWDS(game.spk,game.tally,game.thresh,game.trndex,game.trnluz,game.turns,OBJTXT[OYSTER]);
+	SAVWDS(SPK,game.tally,game.thresh,game.trndex,game.trnluz,game.turns,OBJTXT[OYSTER]);
 	SAVWDS(VERB,WD1,WD1X,WD2,game.wzdark,game.zzword,OBJSND[BIRD]);
-	SAVWDS(OBJTXT[SIGN],game.clshint,game.novice,K,K,K,K);
-	SAVARR(ABB,LOCSIZ);
+	SAVWDS(OBJTXT[SIGN],game.clshnt,game.novice,K,K,K,K);
+	SAVARR(game.abbrev,LOCSIZ);
 	SAVARR(ATLOC,LOCSIZ);
-	SAVARR(DLOC,6);
-	SAVARR(game.dseen,6);
-	SAVARR(FIXED,100);
+	SAVARR(game.dloc,NDWARVES);
+	SAVARR(game.dseen,NDWARVES);
+	SAVARR(FIXED,NOBJECTS);
 	SAVARR(HINTED,HNTSIZ);
 	SAVARR(HINTLC,HNTSIZ);
-	SAVARR(LINK,200);
-	SAVARR(ODLOC,6);
-	SAVARR(PLACE,100);
-	SAVARR(PROP,100);
+	SAVARR(LINK,NOBJECTS*2);
+	SAVARR(game.odloc,NDWARVES);
+	SAVARR(PLACE,NOBJECTS);
+	SAVARR(PROP,NOBJECTS);
 	SAVWRD(KK,K);
 	if(K != 0) goto L8318;
 	K=NUL;
-	game.zzword=RNDVOC(3,game.zzword-MESH*2)+MESH*2;
+	game.zzword=RNDVOC(3,game.zzword);
 	if(KK > 0) return(8);
 	RSPEAK(266);
 	exit(0);
@@ -563,7 +562,7 @@ L8305:	DATIME(I,K);
 /*  Resume.  Read a suspended game back from a file. */
 
 L8310:	KK=1;
-	if(LOC == 1 && ABB[1] == 1) goto L8305;
+	if(LOC == 1 && game.abbrev[1] == 1) goto L8305;
 	RSPEAK(268);
 	if(!YES(input,200,54,54)) return(2012);
 	 goto L8305;
@@ -578,35 +577,35 @@ L8318:	RSPEAK(270);
 
 /*  Fly.  Snide remarks unless hovering rug is here. */
 
-L8320:	if(PROP[RUG] != 2)game.spk=224;
-	if(!HERE(RUG))game.spk=225;
-	if(game.spk/2 == 112) return(2011);
+L8320:	if(PROP[RUG] != 2)SPK=224;
+	if(!HERE(RUG))SPK=225;
+	if(SPK/2 == 112) return(2011);
 	OBJ=RUG;
 
 L9320:	if(OBJ != RUG) return(2011);
-	game.spk=223;
+	SPK=223;
 	if(PROP[RUG] != 2) return(2011);
 	game.oldlc2=game.oldloc;
 	game.oldloc=LOC;
 	game.newloc=PLACE[RUG]+FIXED[RUG]-LOC;
-	game.spk=226;
-	if(PROP[SAPPH] >= 0)game.spk=227;
-	RSPEAK(game.spk);
+	SPK=226;
+	if(PROP[SAPPH] >= 0)SPK=227;
+	RSPEAK(SPK);
 	 return(2);
 
 /*  Listen.  Intransitive only.  Print stuff based on objsnd/locsnd. */
 
-L8330:	game.spk=228;
+L8330:	SPK=228;
 	K=LOCSND[LOC];
 	if(K == 0) goto L8332;
-	RSPEAK(IABS(K));
+	RSPEAK(labs(K));
 	if(K < 0) return(2012);
-	game.spk=0;
-L8332:	SETPRM(1,game.zzword-MESH*2,0);
-	/* 8335 */ for (I=1; I<=100; I++) {
+	SPK=0;
+L8332:	SETPRM(1,game.zzword,0);
+	/* 8335 */ for (I=1; I<=NOBJECTS; I++) {
 	if(!HERE(I) || OBJSND[I] == 0 || PROP[I] < 0) goto L8335;
 	PSPEAK(I,OBJSND[I]+PROP[I]);
-	game.spk=0;
+	SPK=0;
 	if(I == BIRD && OBJSND[I]+PROP[I] == 8)DSTROY(BIRD);
 L8335:	/*etc*/ ;
 	} /* end loop */