X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=actions1.c;h=5ef0953c79830b97bdf2565fe785a2b39243d59f;hb=77d2a1e5dd5d5ff3353a54ad0741427f7f2b8c28;hp=66bad5e89017bb127e544326673eac0a61f04bb6;hpb=dc9d9e467b4efe76c30f15ccd23ceede2326f5e8;p=open-adventure.git

diff --git a/actions1.c b/actions1.c
index 66bad5e..5ef0953 100644
--- a/actions1.c
+++ b/actions1.c
@@ -4,6 +4,7 @@
 #include "main.h"
 #include "share.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
@@ -30,42 +31,82 @@ L4000:	VERB=K;
 
 /*  Analyse an intransitive verb (ie, no object given yet). */
 
-	switch (VERB-1) { case 0: goto L8010; case 1: return(8000); case 2:
-		return(8000); case 3: goto L8040; case 4: return(2009); case 5: goto L8040;
-		case 6: goto L8070; case 7: goto L8080; case 8: return(8000); case
-		9: return(8000); case 10: return(2011); case 11: goto L9120; case 12:
-		goto L9130; case 13: goto L8140; case 14: goto L9150; case 15:
-		return(8000); case 16: return(8000); case 17: goto L8180; case 18:
-		return(8000); case 19: goto L8200; case 20: return(8000); case 21:
-		goto L9220; case 22: goto L9230; case 23: goto L8240; case 24:
-		goto L8250; case 25: goto L8260; case 26: goto L8270; case 27:
-		return(8000); case 28: return(8000); case 29: goto L8300; case 30:
-		goto L8310; case 31: goto L8320; case 32: goto L8330; case 33:
-		goto L8340; }
-/*	     TAKE DROP  SAY OPEN NOTH LOCK   ON  OFF WAVE CALM
- *	     WALK KILL POUR  EAT DRNK  RUB TOSS QUIT FIND INVN
- *	     FEED FILL BLST SCOR  FOO  BRF READ BREK WAKE SUSP
- *	     RESU FLY  LSTN ZZZZ */
+	switch (VERB-1) {
+		case 0: goto L8010;	/* CARRY */
+		case 1: return(8000);	/* DROP */
+		case 2:	return(8000);	/* SAY */
+		case 3: goto L8040;	/* UNLOC */
+		case 4: return(2009);	/* NOTHI */
+		case 5:	goto L8040;	/* LOCK */
+		case 6: goto L8070;	/* LIGHT */
+		case 7: goto L8080;	/* EXTIN */
+		case 8: return(8000);	/* WAVE */
+		case 9: return(8000);	/* CALM */
+		case 10: return(2011);	/* WALK */
+		case 11: goto L9120;	/* ATTAC */
+		case 12: goto L9130;	/* POUR */
+		case 13: goto L8140;	/* EAT */
+		case 14: goto L9150;	/* DRINK */
+		case 15: return(8000);	/* RUB */
+		case 16: return(8000);	/* TOSS */
+		case 17: goto L8180;	/* QUIT */
+		case 18: return(8000);	/* FIND */
+		case 19: goto L8200;	/* INVEN */
+		case 20: return(8000);	/* FEED */
+		case 21: goto L9220;	/* FILL */
+		case 22: goto L9230;	/* BLAST */
+		case 23: goto L8240;	/* SCOR */
+		case 24: goto L8250;	/* FOO */
+		case 25: goto L8260;	/* BRIEF */
+		case 26: goto L8270;	/* READ */
+		case 27: return(8000);	/* BREAK */
+		case 28: return(8000);	/* WAKE */
+		case 29: goto L8300;	/* SUSP */
+		case 30: goto L8310;	/* RESU */
+		case 31: goto L8320;	/* FLY */
+		case 32: goto L8330;	/* LISTEN */
+		case 33: goto L8340;	/* ZZZZ */
+	}
 	BUG(23);
 
 /*  Analyse a transitive verb. */
 
-L4090:	switch (VERB-1) { case 0: goto L9010; case 1: goto L9020; case 2: goto
-		L9030; case 3: goto L9040; case 4: return(2009); case 5: goto L9040;
-		case 6: goto L9070; case 7: goto L9080; case 8: goto L9090; case
-		9: return(2011); case 10: return(2011); case 11: goto L9120; case 12:
-		goto L9130; case 13: goto L9140; case 14: goto L9150; case 15:
-		goto L9160; case 16: goto L9170; case 17: return(2011); case 18:
-		goto L9190; case 19: goto L9190; case 20: goto L9210; case 21:
-		goto L9220; case 22: goto L9230; case 23: return(2011); case 24:
-		return(2011); case 25: return(2011); case 26: goto L9270; case 27:
-		goto L9280; case 28: goto L9290; case 29: return(2011); case 30:
-		return(2011); case 31: goto L9320; case 32: return(2011); case 33:
-		goto L8340; }
-/*	     TAKE DROP  SAY OPEN NOTH LOCK   ON  OFF WAVE CALM
- *	     WALK KILL POUR  EAT DRNK  RUB TOSS QUIT FIND INVN
- *	     FEED FILL BLST SCOR  FOO  BRF READ BREK WAKE SUSP
- *	     RESU FLY  LSTN ZZZZ */
+L4090:	switch (VERB-1) {
+		case 0: goto L9010;	/* CARRY */
+		case 1: goto L9020;	/* DROP */
+		case 2: goto L9030;	/* SAY */
+		case 3: goto L9040;	/* UNLOC */
+		case 4: return(2009);	/* NOTHI */
+		case 5: goto L9040;	/* LOCK */
+		case 6: goto L9070;	/* LIGHT */
+		case 7: goto L9080;	/* EXTI */
+		case 8: goto L9090;	/* WAVE */
+		case 9: return(2011);	/* CALM */
+		case 10: return(2011);	/* WALK */
+		case 11: goto L9120;	/* ATTAC */
+		case 12: goto L9130;	/* POUR */
+		case 13: goto L9140;	/* EAT */
+		case 14: goto L9150;	/* DRINK */
+		case 15: goto L9160;	/* RUB */
+		case 16: goto L9170;	/* TOSS */
+		case 17: return(2011);	/* QUIT */
+		case 18: goto L9190;	/* FIND */
+		case 19: goto L9190;	/* INVEN */
+		case 20: goto L9210;	/* FEED */
+		case 21: goto L9220;	/* FILL */
+		case 22: goto L9230;	/* BLAST */
+		case 23: return(2011);	/* SCOR */
+		case 24: return(2011);	/* FOO */
+		case 25: return(2011);	/* BRIEF */
+		case 26: goto L9270;	/* READ */
+		case 27: goto L9280;	/* BREAK */
+		case 28: goto L9290;	/* WAKE */
+		case 29: return(2011);	/* SUSP */
+		case 30: return(2011);	/* RESU */
+		case 31: goto L9320;	/* FLY */
+		case 32: return(2011);	/* LISTEN */
+		case 33: goto L8340;	/* ZZZZ */
+	}
 	BUG(24);
 
 /*  Analyse an object word.  See if the thing is here, whether we've got a verb
@@ -482,7 +523,7 @@ L8300:	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;
@@ -515,7 +556,7 @@ L8305:	DATIME(I,K);
 	SAVWRD(KK,K);
 	if(K != 0) goto L8318;
 	K=NUL;
-	ZZWORD=RNDVOC(3,ZZWORD-MESH*2)+MESH*2;
+	ZZWORD=RNDVOC(3,ZZWORD);
 	if(KK > 0) return(8);
 	RSPEAK(266);
 	exit(0);
@@ -562,7 +603,7 @@ L8330:	SPK=228;
 	RSPEAK(IABS(K));
 	if(K < 0) return(2012);
 	SPK=0;
-L8332:	SETPRM(1,ZZWORD-MESH*2,0);
+L8332:	SETPRM(1,ZZWORD,0);
 	/* 8335 */ for (I=1; I<=100; I++) {
 	if(!HERE(I) || OBJSND[I] == 0 || PROP[I] < 0) goto L8335;
 	PSPEAK(I,OBJSND[I]+PROP[I]);