Abolish funcs.h.

[open-adventure.git] / actions1.c

diff --git a/actions1.c b/actions1.c
index e887e569bafce5edef43070dd97527b676b601b8..5de9a1f84a89f31a2b166032482353a7958565e5 100644 (file)
--- 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;
@@ -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);