X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=misc.c;h=baa0d56c70c7a69f05f68c0f894cfe1c22bb651a;hb=19b3e3e65697b39891e69639de460cbcc50f351e;hp=391b43c4d06eae816b5b6437f18614f6bf953480;hpb=18767d52dd053cf6c851ded2597697674ca255c1;p=open-adventure.git

diff --git a/misc.c b/misc.c
index 391b43c..baa0d56 100644
--- a/misc.c
+++ b/misc.c
@@ -26,8 +26,8 @@ L10:	L=IABS(LINES[K])-1;
 	LNLENG=0;
 	LNPOSN=1;
 	STATE=0;
-	/* 20 */ for (I=K; I<=L; I++) {
-L20:	PUTTXT(LINES[I],STATE,2,I);
+	for (I=K; I<=L; I++) {
+	PUTTXT(LINES[I],STATE,2,I);
 	} /* end loop */
 	LNPOSN=0;
 L30:	LNPOSN=LNPOSN+1;
@@ -83,9 +83,9 @@ L345:	if(PARMS[NPARMS] < 0) goto L395;
 L360:	PRMTYP=PARMS[NPARMS];
 	SHFTXT(LNPOSN+2,PRMTYP-2);
 	if(PRMTYP == 0) goto L395;
-	/* 365 */ for (I=1; I<=PRMTYP; I++) {
+	for (I=1; I<=PRMTYP; I++) {
 	INLINE[LNPOSN]=0;
-L365:	LNPOSN=LNPOSN+1;
+	LNPOSN=LNPOSN+1;
 	} /* end loop */
 	 goto L395;
 
@@ -123,10 +123,10 @@ long I, M;
 
 	M=PTEXT[MSG];
 	if(SKIP < 0) goto L9;
-	/* 3 */ for (I=0; I<=SKIP; I++) {
+	for (I=0; I<=SKIP; I++) {
 L1:	M=IABS(LINES[M]);
 	if(LINES[M] >= 0) goto L1;
-L3:	/*etc*/ ;
+	/*etc*/ ;
 	} /* end loop */
 L9:	SPEAK(M);
 	return;
@@ -408,11 +408,11 @@ long I, II, JJ;
 
 
 	if(LNLENG < FROM || DELTA == 0) goto L2;
-	/* 1 */ for (I=FROM; I<=LNLENG; I++) {
+	for (I=FROM; I<=LNLENG; I++) {
 	II=I;
 	if(DELTA > 0)II=FROM+LNLENG-I;
 	JJ=II+DELTA;
-L1:	INLINE[JJ]=INLINE[II];
+	INLINE[JJ]=INLINE[II];
 	} /* end loop */
 L2:	LNLENG=LNLENG+DELTA;
 	return;
@@ -468,8 +468,8 @@ long I;
 /*  Write or read an array of N words.  See SAVWRD. */
 
 
-	/* 1 */ for (I=1; I<=N; I++) {
-L1:	SAVWRD(0,ARR[I]);
+	for (I=1; I<=N; I++) {
+	SAVWRD(0,ARR[I]);
 	} /* end loop */
 	return;
 }
@@ -588,7 +588,7 @@ void fDSTROY(long OBJECT) {
 
 #define DSTROY(OBJECT) fDSTROY(OBJECT)
 #undef JUGGLE
-void fJUGGLE(OBJECT)long OBJECT; {
+void fJUGGLE(long OBJECT) {
 long I, J;
 
 /*  Juggle an object by picking it up and putting it down again, the purpose
@@ -606,7 +606,7 @@ long I, J;
 
 #define JUGGLE(OBJECT) fJUGGLE(OBJECT)
 #undef MOVE
-void fMOVE(OBJECT,WHERE)long OBJECT, WHERE; {
+void fMOVE(long OBJECT, long WHERE) {
 long FROM;
 
 /*  Place any object anywhere by picking it up and dropping it.  May already be
@@ -627,7 +627,7 @@ L2:	if(FROM > 0 && FROM <= 300)CARRY(OBJECT,FROM);
 
 #define MOVE(OBJECT,WHERE) fMOVE(OBJECT,WHERE)
 #undef PUT
-long fPUT(OBJECT,WHERE,PVAL)long OBJECT, PVAL, WHERE; {
+long fPUT(long OBJECT, long WHERE, long PVAL) {
 long PUT;
 
 /*  PUT is the same as MOVE, except it returns a value used to set up the
@@ -643,7 +643,7 @@ long PUT;
 
 #define PUT(OBJECT,WHERE,PVAL) fPUT(OBJECT,WHERE,PVAL)
 #undef CARRY
-void fCARRY(OBJECT,WHERE)long OBJECT, WHERE; {
+void fCARRY(long OBJECT, long WHERE) {
 long TEMP;
 
 /*  Start toting an object, removing it from the list of things at its former
@@ -670,7 +670,7 @@ L8:	LINK[TEMP]=LINK[OBJECT];
 
 #define CARRY(OBJECT,WHERE) fCARRY(OBJECT,WHERE)
 #undef DROP
-void fDROP(OBJECT,WHERE)long OBJECT, WHERE; {
+void fDROP(long OBJECT, long WHERE) {
 ;
 
 /*  Place an object at a given loc, prefixing it onto the ATLOC list.  Decr
@@ -692,7 +692,7 @@ L2:	if(WHERE <= 0)return;
 
 #define DROP(OBJECT,WHERE) fDROP(OBJECT,WHERE)
 #undef ATDWRF
-long fATDWRF(WHERE)long WHERE; {
+long fATDWRF(long WHERE) {
 long ATDWRF, I;
 
 /*  Return the index of first dwarf at the given location, zero if no dwarf is
@@ -703,9 +703,9 @@ long ATDWRF, I;
 	ATDWRF=0;
 	if(DFLAG < 2)return(ATDWRF);
 	ATDWRF= -1;
-	/* 1 */ for (I=1; I<=5; I++) {
+	for (I=1; I<=5; I++) {
 	if(DLOC[I] == WHERE) goto L2;
-L1:	if(DLOC[I] != 0)ATDWRF=0;
+	if(DLOC[I] != 0)ATDWRF=0;
 	} /* end loop */
 	return(ATDWRF);
 
@@ -723,7 +723,7 @@ L2:	ATDWRF=I;
 /*  Utility routines (SETBIT, TSTBIT, RAN, RNDVOC, BUG) */
 
 #undef SETBIT
-long fSETBIT(BIT)long BIT; {
+long fSETBIT(long BIT) {
 long I, SETBIT;
 
 /*  Returns 2**bit for use in constructing bit-masks. */
@@ -731,8 +731,8 @@ long I, SETBIT;
 
 	SETBIT=1;
 	if(BIT <= 0)return(SETBIT);
-	/* 1 */ for (I=1; I<=BIT; I++) {
-L1:	SETBIT=SETBIT+SETBIT;
+	for (I=1; I<=BIT; I++) {
+	SETBIT=SETBIT+SETBIT;
 	} /* end loop */
 	return(SETBIT);
 }
@@ -741,7 +741,7 @@ L1:	SETBIT=SETBIT+SETBIT;
 
 #define SETBIT(BIT) fSETBIT(BIT)
 #undef TSTBIT
-long fTSTBIT(MASK,BIT)long BIT, MASK; {
+long fTSTBIT(long MASK, long BIT) {
 long TSTBIT;
 
 /*  Returns true if the specified bit is set in the mask. */
@@ -755,7 +755,7 @@ long TSTBIT;
 
 #define TSTBIT(MASK,BIT) fTSTBIT(MASK,BIT)
 #undef RAN
-long fRAN(RANGE)long RANGE; {
+long fRAN(long RANGE) {
 static long D, R = 0, RAN, T;
 
 /*  Since the ran function in LIB40 seems to be a real lose, we'll use one of
@@ -769,8 +769,8 @@ static long D, R = 0, RAN, T;
 	DATIME(D,T);
 	R=MOD(T+5,1048576L);
 	D=1000+MOD(D,1000);
-L1:	/* 2 */ for (T=1; T<=D; T++) {
-L2:	R=MOD(R*1093L+221587L,1048576L);
+L1:	for (T=1; T<=D; T++) {
+	R=MOD(R*1093L+221587L,1048576L);
 	} /* end loop */
 	RAN=(RANGE*R)/1048576;
 	return(RAN);
@@ -780,7 +780,7 @@ L2:	R=MOD(R*1093L+221587L,1048576L);
 
 #define RAN(RANGE) fRAN(RANGE)
 #undef RNDVOC
-long fRNDVOC(CHAR,FORCE)long CHAR, FORCE; {
+long fRNDVOC(long CHAR, long FORCE) {
 long DIV, I, J, RNDVOC;
 
 /*  Searches the vocabulary for a word whose second character is char, and
@@ -791,17 +791,17 @@ long DIV, I, J, RNDVOC;
 
 	RNDVOC=FORCE;
 	if(RNDVOC != 0) goto L3;
-	/* 1 */ for (I=1; I<=5; I++) {
+	for (I=1; I<=5; I++) {
 	J=11+RAN(26);
 	if(I == 2)J=CHAR;
-L1:	RNDVOC=RNDVOC*64+J;
+	RNDVOC=RNDVOC*64+J;
 	} /* end loop */
 L3:	J=10000;
 	DIV=64L*64L*64L;
-	/* 5 */ for (I=1; I<=TABSIZ; I++) {
+	for (I=1; I<=TABSIZ; I++) {
 	J=J+7;
 	if(MOD((ATAB[I]-J*J)/DIV,64L) == CHAR) goto L8;
-L5:	/*etc*/ ;
+	/*etc*/ ;
 	} /* end loop */
 	BUG(5);
 
@@ -813,7 +813,7 @@ L8:	ATAB[I]=RNDVOC+J*J;
 
 #define RNDVOC(CHAR,FORCE) fRNDVOC(CHAR,FORCE)
 #undef BUG
-void fBUG(NUM)long NUM; {
+void fBUG(long NUM) {
 
 /*  The following conditions are currently considered fatal bugs.  Numbers < 20
  *  are detected while reading the database; the others occur at "run time".
@@ -853,7 +853,7 @@ void fBUG(NUM)long NUM; {
 
 #define BUG(NUM) fBUG(NUM)
 #undef MAPLIN
-void fMAPLIN(FIL)long FIL; {
+void fMAPLIN(long FIL) {
 long I, VAL; static FILE *OPENED = NULL;
 
 /*  Read a line of input, either from a file (if FIL=true) or from the
@@ -897,13 +897,13 @@ 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,100,OPENED));
+	 IGNORE(fgets(INLINE+1,sizeof(INLINE)-1,OPENED));
 
 L20:	LNLENG=0;
-	/* 25 */ for (I=1; I<=100 && INLINE[I]!=0; I++) {
+	for (I=1; I<=sizeof(INLINE) && INLINE[I]!=0; I++) {
 	VAL=INLINE[I]+1;
 	INLINE[I]=MAP1[VAL];
-L25:	if(INLINE[I] != 0)LNLENG=I;
+	if(INLINE[I] != 0)LNLENG=I;
 	} /* end loop */
 	LNPOSN=1;
 	if(FIL && LNLENG == 0) goto L15;
@@ -916,7 +916,7 @@ L25:	if(INLINE[I] != 0)LNLENG=I;
 
 #define MAPLIN(FIL) fMAPLIN(FIL)
 #undef TYPE
-void fTYPE() {
+void fTYPE(void) {
 long I, VAL;
 
 /*  Type the first "LNLENG" characters stored in inline, mapping them
@@ -929,9 +929,9 @@ long I, VAL;
 	return;
 
 L10:	if(MAP2[1] == 0)MPINIT();
-	/* 20 */ for (I=1; I<=LNLENG; I++) {
+	for (I=1; I<=LNLENG; I++) {
 	VAL=INLINE[I];
-L20:	{long x = VAL+1; INLINE[I]=MAP2[x];}
+	{long x = VAL+1; INLINE[I]=MAP2[x];}
 	} /* end loop */
 	{long x = LNLENG+1; INLINE[x]=0;}
 	printf("%s\n",INLINE+1);
@@ -942,16 +942,16 @@ L20:	{long x = VAL+1; INLINE[I]=MAP2[x];}
 
 #define TYPE() fTYPE()
 #undef MPINIT
-void fMPINIT() {
+void fMPINIT(void) {
 long FIRST, I, J, LAST, VAL;
 static long RUNS[7][2] = {32,34, 39,46, 65,90, 97,122, 37,37, 48,57, 0,126};
 
 
-	/* 10 */ for (I=1; I<=128; I++) {
-L10:	MAP1[I]= -1;
+	for (I=1; I<=128; I++) {
+	MAP1[I]= -1;
 	} /* end loop */
 	VAL=0;
-	/* 20 */ for (I=0; I<7; I++) {
+	for (I=0; I<7; I++) {
 	FIRST=RUNS[I][0];
 	LAST=RUNS[I][1];
 	/* 22 */ for (J=FIRST; J<=LAST; J++) {
@@ -960,17 +960,17 @@ L10:	MAP1[I]= -1;
 	VAL=VAL+1;
 L22:	J--;
 	} /* end loop */
-L20:	/*etc*/ ;
+	/*etc*/ ;
 	} /* end loop */
 	MAP1[128]=MAP1[10];
 /*  For this version, tab (9) maps to space (32), so del (127) uses tab's value */
 	MAP1[10]=MAP1[33];
 	MAP1[11]=MAP1[33];
 
-	/* 30 */ for (I=0; I<=126; I++) {
+	for (I=0; I<=126; I++) {
 	I++; VAL=MAP1[I]+1; I--;
 	MAP2[VAL]=I*('B'-'A');
-L30:	if(I >= 64)MAP2[VAL]=(I-64)*('B'-'A')+'@';
+	if(I >= 64)MAP2[VAL]=(I-64)*('B'-'A')+'@';
 	} /* end loop */
 
 	return;
@@ -980,7 +980,7 @@ L30:	if(I >= 64)MAP2[VAL]=(I-64)*('B'-'A')+'@';
 
 #define MPINIT() fMPINIT()
 #undef SAVEIO
-void fSAVEIO(OP,IN,ARR)long ARR[], IN, OP; {
+void fSAVEIO(long OP, long IN, long ARR[]) {
 static FILE *F; char NAME[50];
 
 /*  If OP=0, ask for a file name and open a file.  (If IN=true, the file is for
@@ -1004,8 +1004,8 @@ L20:	printf("\nFile name: ");
 	if(F == NULL) {printf("Can't open file, try again.\n"); goto L20;}
 	return;
 
-L30:	if(IN)IGNORE(fread(ARR,4,250,F));
-	if(!IN)fwrite(ARR,4,250,F);
+L30:	if(IN)IGNORE(fread(ARR,sizeof(long),250,F));
+	if(!IN)fwrite(ARR,sizeof(long),250,F);
 	return;
 
 }