X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=actions1.c;h=5de9a1f84a89f31a2b166032482353a7958565e5;hb=46cd836df0943cfab98494d8668479f7ac93b762;hp=9d9997ba2bbf769e14a62e0e418c10932ca871a8;hpb=0e3456069fd18c352dc0823f07ed694d7b211c2c;p=open-adventure.git

diff --git a/actions1.c b/actions1.c
index 9d9997b..5de9a1f 100644
--- a/actions1.c
+++ b/actions1.c
@@ -1,7 +1,6 @@
 #include <stdlib.h>
 #include <stdbool.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
@@ -15,6 +14,7 @@
  */
 
 int action(FILE *input, long STARTAT, long verb, long obj) {
+	int kk;
 	switch(STARTAT) {
 	   case 4000: goto L4000;
 	   case 4090: goto L4090;
@@ -436,10 +436,7 @@ L9230:	if(game.prop[ROD2] < 0 || !game.closed) return(2011);
 /*  Score.  Call scoring routine but tell it to return. */
 
 L8240:	score(-1);
-	SETPRM(1,SCORE,MXSCOR);
-	SETPRM(3,game.turns,game.turns);
-	RSPEAK(259);
-	 return(2012);
+	return(2012);
 
 /*  FEE FIE FOE FOO (AND FUM).  Advance to next state if given in proper order.
  *  Look up WD1 in section 3 of vocab to determine which word we've got.  Last
@@ -517,14 +514,14 @@ L8300:	SPK=201;
 	RSPEAK(260);
 	if(!YES(input,200,54,54)) return(2012);
 	game.saved=game.saved+5;
-	KK= -1;
+	kk= -1;
 
 /*  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);
 	K=I+650*K;
-	SAVWRD(KK,K);
+	SAVWRD(kk,K);
 	K=VRSION;
 	SAVWRD(0,K);
 	if(K != VRSION) goto L8312;
@@ -539,7 +536,7 @@ L8305:	DATIME(&I,&K);
 	SAVWDS(game.knfloc,game.limit,K,game.lmwarn,game.loc,game.newloc,game.numdie);
 	SAVWDS(K,game.oldlc2,game.oldloc,game.oldobj,game.panic,game.saved,game.setup);
 	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(K,WD1,WD1X,WD2,game.wzdark,game.zzword,OBJSND[BIRD]);
 	SAVWDS(OBJTXT[SIGN],game.clshnt,game.novice,K,K,K,K);
 	SAVARR(game.abbrev,LOCSIZ);
 	SAVARR(game.atloc,LOCSIZ);
@@ -552,17 +549,17 @@ L8305:	DATIME(&I,&K);
 	SAVARR(game.odloc,NDWARVES);
 	SAVARR(game.place,NOBJECTS);
 	SAVARR(game.prop,NOBJECTS);
-	SAVWRD(KK,K);
+	SAVWRD(kk,K);
 	if(K != 0) goto L8318;
 	K=NUL;
 	game.zzword=RNDVOC(3,game.zzword);
-	if(KK > 0) return(8);
+	if(kk > 0) return(8);
 	RSPEAK(266);
 	exit(0);
 
 /*  Resume.  Read a suspended game back from a file. */
 
-L8310:	KK=1;
+L8310:	kk=1;
 	if(game.loc == 1 && game.abbrev[1] == 1) goto L8305;
 	RSPEAK(268);
 	if(!YES(input,200,54,54)) return(2012);