archives/open-adventure
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix strange inside-out organization of the input routines.

Browse source 
Seems to have nbben a result of FORTRAN not having anything like a
stream object that can be passed around.

A step towards logging and log replay.
This commit is contained in:
Eric S. Raymond 2017-05-22 21:26:14 -04:00
parent 19b3e3e656
commit 040f19adde
7 changed files with 93 additions and 104 deletions
Download patch file Download diff file Expand all files Collapse all files

6
actions1.c
View file

@ -30,7 +30,7 @@ L4000: VERB=K;
/* Analyse an intransitive verb (ie, no object given yet). */ /* Analyse an intransitive verb (ie, no object given yet). */
L4080: switch (VERB-1) { case 0: goto L8010; case 1: return(8000); case 2: 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; 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 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: 9: return(8000); case 10: return(2011); case 11: goto L9120; case 12:
@ -435,8 +435,8 @@ L8260: SPK=156;
/* Read. Print stuff based on objtxt. Oyster (?) is special case. */ /* Read. Print stuff based on objtxt. Oyster (?) is special case. */
L8270: /* 8275 */ for (I=1; I<=100; I++) { L8270: for (I=1; I<=100; I++) {
L8275: if(HERE(I) && OBJTXT[I] != 0 && PROP[I] >= 0)OBJ=OBJ*100+I; if(HERE(I) && OBJTXT[I] != 0 && PROP[I] >= 0)OBJ=OBJ*100+I;
} /* end loop */ } /* end loop */
if(OBJ > 100 || OBJ == 0 || DARK(0)) return(8000); if(OBJ > 100 || OBJ == 0 || DARK(0)) return(8000);

4
actions2.c
View file

@ -187,9 +187,9 @@ L9126: if(OBJ == 0)SPK=44;
MOVE(DRAGON,K); MOVE(DRAGON,K);
MOVE(RUG,K); MOVE(RUG,K);
DROP(BLOOD,K); DROP(BLOOD,K);
/* 9127 */ for (OBJ=1; OBJ<=100; OBJ++) { for (OBJ=1; OBJ<=100; OBJ++) {
if(PLACE[OBJ] == PLAC[DRAGON] || PLACE[OBJ] == FIXD[DRAGON])MOVE(OBJ,K); if(PLACE[OBJ] == PLAC[DRAGON] || PLACE[OBJ] == FIXD[DRAGON])MOVE(OBJ,K);
L9127: /*etc*/ ; /*etc*/ ;
} /* end loop */ } /* end loop */
LOC=K; LOC=K;
K=NUL; K=NUL;

92
init.c
View file

@ -1,9 +1,12 @@
#include <unistd.h>
#include <stdlib.h>
#include <stdio.h>
#include <stdbool.h>
#include "misc.h" #include "misc.h"
#include "main.h" #include "main.h"
#include "share.h" #include "share.h"
#include "funcs.h" #include "funcs.h"
#include <stdio.h>
#include <stdbool.h>
/* /*
* Initialisation * Initialisation
@ -178,6 +181,9 @@ void initialise(void) {
static int raw_init(void) { static int raw_init(void) {
printf("Couldn't find adventure.data, using adventure.text...\n"); printf("Couldn't find adventure.data, using adventure.text...\n");
FILE *OPENED=fopen("adventure.text","r" /* NOT binary */);
if(!OPENED){printf("Can't read adventure.text!\n"); exit(0);}
/* Clear out the various text-pointer arrays. All text is stored in array /* Clear out the various text-pointer arrays. All text is stored in array
* lines; each line is preceded by a word pointing to the next pointer (i.e. * lines; each line is preceded by a word pointing to the next pointer (i.e.
* the word following the end of the line). The pointer is negative if this is * the word following the end of the line). The pointer is negative if this is
@ -210,7 +216,7 @@ L1001: /*etc*/ ;
/* Start new data section. sect is the section number. */ /* Start new data section. sect is the section number. */
L1002: SECT=GETNUM(1); L1002: SECT=GETNUM(OPENED);
OLDLOC= -1; OLDLOC= -1;
switch (SECT) { case 0: return(0); case 1: goto L1004; case 2: goto switch (SECT) { case 0: return(0); case 1: goto L1004; case 2: goto
L1004; case 3: goto L1030; case 4: goto L1040; case 5: goto L1004; L1004; case 3: goto L1030; case 4: goto L1040; case 5: goto L1004;
@ -225,7 +231,7 @@ L1002: SECT=GETNUM(1);
L1004: KK=LINUSE; L1004: KK=LINUSE;
L1005: LINUSE=KK; L1005: LINUSE=KK;
LOC=GETNUM(1); LOC=GETNUM(OPENED);
if(LNLENG >= LNPOSN+70)BUG(0); if(LNLENG >= LNPOSN+70)BUG(0);
if(LOC == -1) goto L1002; if(LOC == -1) goto L1002;
if(LNLENG < LNPOSN)BUG(1); if(LNLENG < LNPOSN)BUG(1);
@ -275,14 +281,14 @@ L1014: TRNVLS=TRNVLS+1;
* this is the last entry for this location. KEY(N) is the index in travel * this is the last entry for this location. KEY(N) is the index in travel
* of the first option at location N. */ * of the first option at location N. */
L1030: LOC=GETNUM(1); L1030: LOC=GETNUM(OPENED);
if(LOC == -1) goto L1002; if(LOC == -1) goto L1002;
NEWLOC=GETNUM(0); NEWLOC=GETNUM(NULL);
if(KEY[LOC] != 0) goto L1033; if(KEY[LOC] != 0) goto L1033;
KEY[LOC]=TRVS; KEY[LOC]=TRVS;
goto L1035; goto L1035;
L1033: TRVS--; TRAVEL[TRVS]= -TRAVEL[TRVS]; TRVS++; L1033: TRVS--; TRAVEL[TRVS]= -TRAVEL[TRVS]; TRVS++;
L1035: L=GETNUM(0); L1035: L=GETNUM(NULL);
if(L == 0) goto L1039; if(L == 0) goto L1039;
TRAVEL[TRVS]=NEWLOC*1000+L; TRAVEL[TRVS]=NEWLOC*1000+L;
TRVS=TRVS+1; TRVS=TRVS+1;
@ -299,11 +305,11 @@ L1039: TRVS--; TRAVEL[TRVS]= -TRAVEL[TRVS]; TRVS++;
* would make it harder to detect particular input words.) */ * would make it harder to detect particular input words.) */
L1040: J=10000; L1040: J=10000;
/* 1042 */ for (TABNDX=1; TABNDX<=TABSIZ; TABNDX++) { for (TABNDX=1; TABNDX<=TABSIZ; TABNDX++) {
L1043: KTAB[TABNDX]=GETNUM(1); KTAB[TABNDX]=GETNUM(OPENED);
if(KTAB[TABNDX] == -1) goto L1002; if(KTAB[TABNDX] == -1) goto L1002;
J=J+7; J=J+7;
L1042: ATAB[TABNDX]=GETTXT(true,true,true,0)+J*J; ATAB[TABNDX]=GETTXT(true,true,true,0)+J*J;
} /* end loop */ } /* end loop */
BUG(4); BUG(4);
@ -311,24 +317,24 @@ L1042: ATAB[TABNDX]=GETTXT(true,true,true,0)+J*J;
* plac contains initial locations of objects. FIXD is -1 for immovable * plac contains initial locations of objects. FIXD is -1 for immovable
* objects (including the snake), or = second loc for two-placed objects. */ * objects (including the snake), or = second loc for two-placed objects. */
L1050: OBJ=GETNUM(1); L1050: OBJ=GETNUM(OPENED);
if(OBJ == -1) goto L1002; if(OBJ == -1) goto L1002;
PLAC[OBJ]=GETNUM(0); PLAC[OBJ]=GETNUM(NULL);
FIXD[OBJ]=GETNUM(0); FIXD[OBJ]=GETNUM(NULL);
goto L1050; goto L1050;
/* Read default message numbers for action verbs, store in ACTSPK. */ /* Read default message numbers for action verbs, store in ACTSPK. */
L1060: VERB=GETNUM(1); L1060: VERB=GETNUM(OPENED);
if(VERB == -1) goto L1002; if(VERB == -1) goto L1002;
ACTSPK[VERB]=GETNUM(0); ACTSPK[VERB]=GETNUM(NULL);
goto L1060; goto L1060;
/* Read info about available liquids and other conditions, store in COND. */ /* Read info about available liquids and other conditions, store in COND. */
L1070: K=GETNUM(1); L1070: K=GETNUM(OPENED);
if(K == -1) goto L1002; if(K == -1) goto L1002;
L1071: LOC=GETNUM(0); L1071: LOC=GETNUM(NULL);
if(LOC == 0) goto L1070; if(LOC == 0) goto L1070;
if(CNDBIT(LOC,K)) BUG(8); if(CNDBIT(LOC,K)) BUG(8);
COND[LOC]=COND[LOC]+SETBIT(K); COND[LOC]=COND[LOC]+SETBIT(K);
@ -337,21 +343,21 @@ L1071: LOC=GETNUM(0);
/* Read data for hints. */ /* Read data for hints. */
L1080: HNTMAX=0; L1080: HNTMAX=0;
L1081: K=GETNUM(1); L1081: K=GETNUM(OPENED);
if(K == -1) goto L1002; if(K == -1) goto L1002;
if(K <= 0 || K > HNTSIZ)BUG(7); if(K <= 0 || K > HNTSIZ)BUG(7);
/* 1083 */ for (I=1; I<=4; I++) { for (I=1; I<=4; I++) {
L1083: HINTS[K][I] =GETNUM(0); HINTS[K][I] =GETNUM(NULL);
} /* end loop */ } /* end loop */
HNTMAX=(HNTMAX>K ? HNTMAX : K); HNTMAX=(HNTMAX>K ? HNTMAX : K);
goto L1081; goto L1081;
/* Read the sound/text info, store in OBJSND, OBJTXT, LOCSND. */ /* Read the sound/text info, store in OBJSND, OBJTXT, LOCSND. */
L1090: K=GETNUM(1); L1090: K=GETNUM(OPENED);
if(K == -1) goto L1002; if(K == -1) goto L1002;
KK=GETNUM(0); KK=GETNUM(NULL);
I=GETNUM(0); I=GETNUM(NULL);
if(I == 0) goto L1092; if(I == 0) goto L1092;
OBJSND[K]=(KK>0 ? KK : 0); OBJSND[K]=(KK>0 ? KK : 0);
OBJTXT[K]=(I>0 ? I : 0); OBJTXT[K]=(I>0 ? I : 0);
@ -372,11 +378,11 @@ L1092: LOCSND[K]=KK;
* description is printed. Counts modulo 5 unless "LOOK" is used. */ * description is printed. Counts modulo 5 unless "LOOK" is used. */
static int finish_init(void) { static int finish_init(void) {
/* 1101 */ for (I=1; I<=100; I++) { for (I=1; I<=100; I++) {
PLACE[I]=0; PLACE[I]=0;
PROP[I]=0; PROP[I]=0;
LINK[I]=0; LINK[I]=0;
L1101: {long x = I+100; LINK[x]=0;} {long x = I+100; LINK[x]=0;}
} /* end loop */ } /* end loop */
/* 1102 */ for (I=1; I<=LOCSIZ; I++) { /* 1102 */ for (I=1; I<=LOCSIZ; I++) {
@ -402,10 +408,10 @@ L1102: ATLOC[I]=0;
L1106: /*etc*/ ; L1106: /*etc*/ ;
} /* end loop */ } /* end loop */
/* 1107 */ for (I=1; I<=100; I++) { for (I=1; I<=100; I++) {
K=101-I; K=101-I;
FIXED[K]=FIXD[K]; FIXED[K]=FIXD[K];
L1107: if(PLAC[K] != 0 && FIXD[K] <= 0)DROP(K,PLAC[K]); if(PLAC[K] != 0 && FIXD[K] <= 0)DROP(K,PLAC[K]);
} /* end loop */ } /* end loop */
/* Treasures, as noted earlier, are objects 50 through MAXTRS (CURRENTLY 79). /* Treasures, as noted earlier, are objects 50 through MAXTRS (CURRENTLY 79).
@ -415,17 +421,17 @@ L1107: if(PLAC[K] != 0 && FIXD[K] <= 0)DROP(K,PLAC[K]);
MAXTRS=79; MAXTRS=79;
TALLY=0; TALLY=0;
/* 1200 */ for (I=50; I<=MAXTRS; I++) { for (I=50; I<=MAXTRS; I++) {
if(PTEXT[I] != 0)PROP[I]= -1; if(PTEXT[I] != 0)PROP[I]= -1;
L1200: TALLY=TALLY-PROP[I]; TALLY=TALLY-PROP[I];
} /* end loop */ } /* end loop */
/* Clear the hint stuff. HINTLC(I) is how long he's been at LOC with cond bit /* Clear the hint stuff. HINTLC(I) is how long he's been at LOC with cond bit
* I. HINTED(I) is true iff hint I has been used. */ * I. HINTED(I) is true iff hint I has been used. */
/* 1300 */ for (I=1; I<=HNTMAX; I++) { for (I=1; I<=HNTMAX; I++) {
HINTED[I]=false; HINTED[I]=false;
L1300: HINTLC[I]=0; HINTLC[I]=0;
} /* end loop */ } /* end loop */
/* Define some handy mnemonics. these correspond to object numbers. */ /* Define some handy mnemonics. these correspond to object numbers. */
@ -524,8 +530,8 @@ L1300: HINTLC[I]=0;
CHLOC=114; CHLOC=114;
CHLOC2=140; CHLOC2=140;
/* 1700 */ for (I=1; I<=6; I++) { for (I=1; I<=6; I++) {
L1700: DSEEN[I]=false; DSEEN[I]=false;
} /* end loop */ } /* end loop */
DFLAG=0; DFLAG=0;
DLOC[1]=19; DLOC[1]=19;
@ -569,8 +575,8 @@ L1700: DSEEN[I]=false;
KNFLOC=0; KNFLOC=0;
DETAIL=0; DETAIL=0;
ABBNUM=5; ABBNUM=5;
/* 1800 */ for (I=0; I<=4; I++) { for (I=0; I<=4; I++) {
L1800: {long x = 2*I+81; if(RTEXT[x] != 0)MAXDIE=I+1;} {long x = 2*I+81; if(RTEXT[x] != 0)MAXDIE=I+1;}
} /* end loop */ } /* end loop */
NUMDIE=0; NUMDIE=0;
HOLDNG=0; HOLDNG=0;
@ -596,25 +602,25 @@ L1800: {long x = 2*I+81; if(RTEXT[x] != 0)MAXDIE=I+1;}
/* Report on amount of arrays actually used, to permit reductions. */ /* Report on amount of arrays actually used, to permit reductions. */
static void report(void) { static void report(void) {
/* 1998 */ for (K=1; K<=LOCSIZ; K++) { for (K=1; K<=LOCSIZ; K++) {
KK=LOCSIZ+1-K; KK=LOCSIZ+1-K;
if(LTEXT[KK] != 0) goto L1997; if(LTEXT[KK] != 0) goto L1997;
L1998: /*etc*/ ; /*etc*/ ;
} /* end loop */ } /* end loop */
OBJ=0; OBJ=0;
L1997: /* 1996 */ for (K=1; K<=100; K++) { L1997: for (K=1; K<=100; K++) {
L1996: if(PTEXT[K] != 0)OBJ=OBJ+1; if(PTEXT[K] != 0)OBJ=OBJ+1;
} /* end loop */ } /* end loop */
/* 1995 */ for (K=1; K<=TABNDX; K++) { for (K=1; K<=TABNDX; K++) {
L1995: if(KTAB[K]/1000 == 2)VERB=KTAB[K]-2000; if(KTAB[K]/1000 == 2)VERB=KTAB[K]-2000;
} /* end loop */ } /* end loop */
/* 1994 */ for (K=1; K<=RTXSIZ; K++) { for (K=1; K<=RTXSIZ; K++) {
J=RTXSIZ+1-K; J=RTXSIZ+1-K;
if(RTEXT[J] != 0) goto L1993; if(RTEXT[J] != 0) goto L1993;
L1994: /*etc*/ ; /*etc*/ ;
} /* end loop */ } /* end loop */
L1993: SETPRM(1,LINUSE,LINSIZ); L1993: SETPRM(1,LINUSE,LINSIZ);

20
main.c
View file

@ -146,13 +146,13 @@ L74: LOC=NEWLOC;
L6000: if(DFLAG != 1) goto L6010; L6000: if(DFLAG != 1) goto L6010;
if(!INDEEP(LOC) || (PCT(95) && (!CNDBIT(LOC,4) || PCT(85)))) goto L2000; if(!INDEEP(LOC) || (PCT(95) && (!CNDBIT(LOC,4) || PCT(85)))) goto L2000;
DFLAG=2; DFLAG=2;
/* 6001 */ for (I=1; I<=2; I++) { for (I=1; I<=2; I++) {
J=1+RAN(5); J=1+RAN(5);
L6001: if(PCT(50))DLOC[J]=0; if(PCT(50))DLOC[J]=0;
} /* end loop */ } /* end loop */
/* 6002 */ for (I=1; I<=5; I++) { for (I=1; I<=5; I++) {
if(DLOC[I] == LOC)DLOC[I]=DALTLC; if(DLOC[I] == LOC)DLOC[I]=DALTLC;
L6002: ODLOC[I]=DLOC[I]; ODLOC[I]=DLOC[I];
} /* end loop */ } /* end loop */
RSPEAK(3); RSPEAK(3);
DROP(AXE,LOC); DROP(AXE,LOC);
@ -347,8 +347,8 @@ L2602: /*etc*/ ;
L2603: if(!CLOSED) goto L2605; L2603: if(!CLOSED) goto L2605;
if(PROP[OYSTER] < 0 && TOTING(OYSTER))PSPEAK(OYSTER,1); if(PROP[OYSTER] < 0 && TOTING(OYSTER))PSPEAK(OYSTER,1);
/* 2604 */ for (I=1; I<=100; I++) { for (I=1; I<=100; I++) {
L2604: if(TOTING(I) && PROP[I] < 0)PROP[I]= -1-PROP[I]; if(TOTING(I) && PROP[I] < 0)PROP[I]= -1-PROP[I];
} /* end loop */ } /* end loop */
L2605: WZDARK=DARK(0); L2605: WZDARK=DARK(0);
if(KNFLOC > 0 && KNFLOC != LOC)KNFLOC=0; if(KNFLOC > 0 && KNFLOC != LOC)KNFLOC=0;
@ -766,9 +766,9 @@ L41000: if(TALLY == 1 && PROP[JADE] < 0) goto L40010;
L10000: PROP[GRATE]=0; L10000: PROP[GRATE]=0;
PROP[FISSUR]=0; PROP[FISSUR]=0;
/* 10010 */ for (I=1; I<=6; I++) { for (I=1; I<=6; I++) {
DSEEN[I]=false; DSEEN[I]=false;
L10010: DLOC[I]=0; DLOC[I]=0;
} /* end loop */ } /* end loop */
MOVE(TROLL,0); MOVE(TROLL,0);
MOVE(TROLL+100,0); MOVE(TROLL+100,0);
@ -822,8 +822,8 @@ L11000: PROP[BOTTLE]=PUT(BOTTLE,115,1);
PROP[MIRROR]=PUT(MIRROR,115,0); PROP[MIRROR]=PUT(MIRROR,115,0);
FIXED[MIRROR]=116; FIXED[MIRROR]=116;
/* 11010 */ for (I=1; I<=100; I++) { for (I=1; I<=100; I++) {
L11010: if(TOTING(I))DSTROY(I); if(TOTING(I))DSTROY(I);
} /* end loop */ } /* end loop */
RSPEAK(132); RSPEAK(132);

44
misc.c
View file

@ -182,7 +182,8 @@ long JUNK;
L10: if(BLKLIN)TYPE0(); L10: if(BLKLIN)TYPE0();
MAPLIN(false); MAPLIN(stdin);
if(feof(stdin)) score(1);
WORD1=GETTXT(true,true,true,0); WORD1=GETTXT(true,true,true,0);
if(BLKLIN && WORD1 < 0) goto L10; if(BLKLIN && WORD1 < 0) goto L10;
WORD1X=GETTXT(false,true,true,0); WORD1X=GETTXT(false,true,true,0);
@ -241,7 +242,7 @@ L20: YES=false;
#define YES(X,Y,Z) fYES(X,Y,Z) #define YES(X,Y,Z) fYES(X,Y,Z)
#undef GETNUM #undef GETNUM
long fGETNUM(long K) { long fGETNUM(FILE *source) {
long DIGIT, GETNUM, SIGN; long DIGIT, GETNUM, SIGN;
/* Obtain the next integer from an input line. If K>0, we first read a /* Obtain the next integer from an input line. If K>0, we first read a
@ -251,7 +252,7 @@ long DIGIT, GETNUM, SIGN;
* character (not a digit, hyphen, or blank), we return 0. */ * character (not a digit, hyphen, or blank), we return 0. */
if(K != 0)MAPLIN(K > 0); if(source != NULL)MAPLIN(source);
GETNUM=0; GETNUM=0;
L10: if(LNPOSN > LNLENG)return(GETNUM); L10: if(LNPOSN > LNLENG)return(GETNUM);
if(INLINE[LNPOSN] != 0) goto L20; if(INLINE[LNPOSN] != 0) goto L20;
@ -853,11 +854,11 @@ void fBUG(long NUM) {
#define BUG(NUM) fBUG(NUM) #define BUG(NUM) fBUG(NUM)
#undef MAPLIN #undef MAPLIN
void fMAPLIN(long FIL) { void fMAPLIN(FILE *OPENED) {
long I, VAL; static FILE *OPENED = NULL; long I, VAL;
/* Read a line of input, either from a file (if FIL=true) or from the /* Read a line of input, from the specified input source,
* keyboard, translate the chars to integers in the range 0-126 and store * translate the chars to integers in the range 0-126 and store
* them in the common array "INLINE". Integer values are as follows: * them in the common array "INLINE". Integer values are as follows:
* 0 = space [ASCII CODE 40 octal, 32 decimal] * 0 = space [ASCII CODE 40 octal, 32 decimal]
* 1-2 = !" [ASCII 41-42 octal, 33-34 decimal] * 1-2 = !" [ASCII 41-42 octal, 33-34 decimal]
@ -879,42 +880,23 @@ long I, VAL; static FILE *OPENED = NULL;
* This procedure may use the map1,map2 arrays to maintain static data for * This procedure may use the map1,map2 arrays to maintain static data for
* the mapping. MAP2(1) is set to 0 when the program starts * the mapping. MAP2(1) is set to 0 when the program starts
* and is not changed thereafter unless the routines on this page choose * and is not changed thereafter unless the routines on this page choose
* to do so. * to do so. */
*
* Note that MAPLIN is expected to open the file the first time it is
* asked to read a line from it. that is, there is no other place where
* the data file is opened. */
if(MAP2[1] == 0)MPINIT(); if(MAP2[1] == 0)MPINIT();
if(FIL) goto L15;
IGNORE(fgets(INLINE+1, sizeof(INLINE)-1, stdin));
if(feof(stdin)) score(1);
goto L20;
L15: if(!OPENED){
OPENED=fopen("adventure.text","r" /* NOT binary */);
if(!OPENED){printf("Can't read adventure.text!\n"); exit(0);}
}
IGNORE(fgets(INLINE+1,sizeof(INLINE)-1,OPENED)); IGNORE(fgets(INLINE+1,sizeof(INLINE)-1,OPENED));
if (!feof(OPENED)) {
L20: LNLENG=0; LNLENG=0;
for (I=1; I<=sizeof(INLINE) && INLINE[I]!=0; I++) { for (I=1; I<=sizeof(INLINE) && INLINE[I]!=0; I++) {
VAL=INLINE[I]+1; VAL=INLINE[I]+1;
INLINE[I]=MAP1[VAL]; INLINE[I]=MAP1[VAL];
if(INLINE[I] != 0)LNLENG=I; if(INLINE[I] != 0)LNLENG=I;
} /* end loop */ } /* end loop */
LNPOSN=1; LNPOSN=1;
if(FIL && LNLENG == 0) goto L15; }
/* Above is to get around an F40 compiler bug wherein it reads a blank
* line whenever a crlf is broken across a record boundary. */
return;
} }
#define MAPLIN(FIL) fMAPLIN(FIL) #define MAPLIN(FIL) fMAPLIN(FIL)
#undef TYPE #undef TYPE
void fTYPE(void) { void fTYPE(void) {
long I, VAL; long I, VAL;

5
misc.h
View file

@ -1,4 +1,5 @@
#include <time.h> #include <time.h>
#include <stdio.h>
/* b is not needed for POSIX but harmless */ /* b is not needed for POSIX but harmless */
#define READ_MODE "rb" #define READ_MODE "rb"
@ -16,7 +17,7 @@ extern void fGETIN(long*,long*,long*,long*);
#define GETIN(WORD1,WORD1X,WORD2,WORD2X) fGETIN(&WORD1,&WORD1X,&WORD2,&WORD2X) #define GETIN(WORD1,WORD1X,WORD2,WORD2X) fGETIN(&WORD1,&WORD1X,&WORD2,&WORD2X)
extern long fYES(long,long,long); extern long fYES(long,long,long);
#define YES(X,Y,Z) fYES(X,Y,Z) #define YES(X,Y,Z) fYES(X,Y,Z)
extern long fGETNUM(long); extern long fGETNUM(FILE *);
#define GETNUM(K) fGETNUM(K) #define GETNUM(K) fGETNUM(K)
extern long fGETTXT(long,long,long,long); extern long fGETTXT(long,long,long,long);
#define GETTXT(SKIP,ONEWRD,UPPER,HASH) fGETTXT(SKIP,ONEWRD,UPPER,HASH) #define GETTXT(SKIP,ONEWRD,UPPER,HASH) fGETTXT(SKIP,ONEWRD,UPPER,HASH)
@ -60,7 +61,7 @@ extern long fRNDVOC(long,long);
#define RNDVOC(CHAR,FORCE) fRNDVOC(CHAR,FORCE) #define RNDVOC(CHAR,FORCE) fRNDVOC(CHAR,FORCE)
extern void fBUG(long); extern void fBUG(long);
#define BUG(NUM) fBUG(NUM) #define BUG(NUM) fBUG(NUM)
extern void fMAPLIN(long); extern void fMAPLIN(FILE *);
#define MAPLIN(FIL) fMAPLIN(FIL) #define MAPLIN(FIL) fMAPLIN(FIL)
extern void fTYPE(); extern void fTYPE();
#define TYPE() fTYPE() #define TYPE() fTYPE()

10
score.c
View file

@ -29,7 +29,7 @@ void score(long MODE) {
* Points can also be deducted for using hints or too many turns, or for * Points can also be deducted for using hints or too many turns, or for
* saving intermediate positions. */ * saving intermediate positions. */
L20000: SCORE=0; SCORE=0;
MXSCOR=0; MXSCOR=0;
/* First tally up the treasures. must be in building and not broken. /* First tally up the treasures. must be in building and not broken.
@ -80,8 +80,8 @@ L20020: MXSCOR=MXSCOR+45;
/* Deduct for hints/turns/saves. Hints < 4 are special; see database desc. */ /* Deduct for hints/turns/saves. Hints < 4 are special; see database desc. */
/* 20030 */ for (I=1; I<=HNTMAX; I++) { for (I=1; I<=HNTMAX; I++) {
L20030: if(HINTED[I])SCORE=SCORE-HINTS[I][2]; if(HINTED[I])SCORE=SCORE-HINTS[I][2];
} /* end loop */ } /* end loop */
if(NOVICE)SCORE=SCORE-5; if(NOVICE)SCORE=SCORE-5;
if(CLSHNT)SCORE=SCORE-10; if(CLSHNT)SCORE=SCORE-10;
@ -98,9 +98,9 @@ L20030: if(HINTED[I])SCORE=SCORE-HINTS[I][2];
SETPRM(1,SCORE,MXSCOR); SETPRM(1,SCORE,MXSCOR);
SETPRM(3,TURNS,TURNS); SETPRM(3,TURNS,TURNS);
RSPEAK(262); RSPEAK(262);
/* 20200 */ for (I=1; I<=CLSSES; I++) { for (I=1; I<=CLSSES; I++) {
if(CVAL[I] >= SCORE) goto L20210; if(CVAL[I] >= SCORE) goto L20210;
L20200: /*etc*/ ; /*etc*/ ;
} /* end loop */ } /* end loop */
SPK=265; SPK=265;
goto L25000; goto L25000;