X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=actions1.c;h=25e05df5d2848e816341109bcbb38cf27bb50eed;hb=00c0da471d5d337f2cdd36cee368bd101edcfb69;hp=79c0ea719c497ac138efb711af7b5c68beab3243;hpb=484ca4e9fd956e431c64d0465dbacd59215d23e4;p=open-adventure.git

diff --git a/actions1.c b/actions1.c
index 79c0ea7..25e05df 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
@@ -522,7 +521,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;
@@ -555,7 +554,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);
@@ -599,10 +598,10 @@ L9320:	if(OBJ != RUG) return(2011);
 L8330:	SPK=228;
 	K=LOCSND[LOC];
 	if(K == 0) goto L8332;
-	RSPEAK(IABS(K));
+	RSPEAK(labs(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]);