#include <stdio.h>
#include <string.h>
#include <sys/time.h>
+
#include "advent.h"
-#include "funcs.h"
#include "database.h"
+#include "linenoise/linenoise.h"
/* hack to ignore GCC Unused Result */
#define IGNORE(r) do{if (r){}}while(0)
+#define PERCENT 63 /* partly hide the packed encoding */
+
/* I/O routines (SPEAK, PSPEAK, RSPEAK, SETPRM, GETIN, YES) */
-void SPEAK(vocab_t N)
-/* Print the message which starts at LINES(N). Precede it with a blank line
+void SPEAK(vocab_t msg)
+/* Print the message which starts at LINES[N]. Precede it with a blank line
* unless game.blklin is false. */
{
- long blank, casemake, I, K, L, NEG, NPARMS, PARM, PRMTYP, state;
+ long blank, casemake, i, nxt, neg, nparms, param, prmtyp, state;
- if (N == 0)
+ if (msg == 0)
return;
blank=game.blklin;
- K=N;
- NPARMS=1;
-L10:
- L=labs(LINES[K])-1;
- K=K+1;
- LNLENG=0;
- LNPOSN=1;
- state=0;
- for (I=K; I<=L; I++) {
- PUTTXT(LINES[I],state,2);
- }
- LNPOSN=0;
-L30:
- LNPOSN=LNPOSN+1;
-L32:
- if (LNPOSN > LNLENG)
- goto L40;
- if (INLINE[LNPOSN] != 63)
- goto L30;
- {long x = LNPOSN+1; PRMTYP=INLINE[x];}
- /* 63 is a "%"; the next character determine the type of
- * parameter: 1 (!) = suppress message completely, 29 (S) = NULL
- * If PARM=1, else 'S' (optional plural ending), 33 (W) = word
- * (two 30-bit values) with trailing spaces suppressed, 22 (L) or
- * 31 (U) = word but map to lower/upper case, 13 (C) = word in
- * lower case with first letter capitalised, 30 (T) = text ending
- * with a word of -1, 65-73 (1-9) = number using that many
- * characters, 12 (B) = variable number of blanks. */
- if (PRMTYP == 1)
- return;
- if (PRMTYP == 29)
- goto L320;
- if (PRMTYP == 30)
- goto L340;
- if (PRMTYP == 12)
- goto L360;
- if (PRMTYP == 33 || PRMTYP == 22 || PRMTYP == 31 || PRMTYP == 13)
- goto L380;
- PRMTYP=PRMTYP-64;
- if (PRMTYP < 1 || PRMTYP > 9) goto L30;
- SHFTXT(LNPOSN+2,PRMTYP-2);
- LNPOSN=LNPOSN+PRMTYP;
- PARM=labs(PARMS[NPARMS]);
- NEG=0;
- if (PARMS[NPARMS] < 0)
- NEG=9;
- /* 390 */ for (I=1; I<=PRMTYP; I++) {
- LNPOSN=LNPOSN-1;
- INLINE[LNPOSN]=MOD(PARM,10)+64;
- if (I == 1 || PARM != 0)
- goto L390;
- INLINE[LNPOSN]=NEG;
- NEG=0;
-L390:
- PARM=PARM/10;
- }
- LNPOSN=LNPOSN+PRMTYP;
-L395:
- NPARMS=NPARMS+1;
- goto L32;
-
-L320:
- SHFTXT(LNPOSN+2,-1);
- INLINE[LNPOSN]=55;
- if (PARMS[NPARMS] == 1)
- SHFTXT(LNPOSN+1,-1);
- goto L395;
-
-L340:
- SHFTXT(LNPOSN+2,-2);
- state=0;
- casemake=2;
-L345:
- if (PARMS[NPARMS] < 0) goto L395;
- {long x = NPARMS+1; if (PARMS[x] < 0)
- casemake=0;}
- PUTTXT(PARMS[NPARMS],state,casemake);
- NPARMS=NPARMS+1;
- goto L345;
-
-L360:
- PRMTYP=PARMS[NPARMS];
- SHFTXT(LNPOSN+2,PRMTYP-2);
- if (PRMTYP == 0) goto L395;
- for (I=1; I<=PRMTYP; I++) {
- INLINE[LNPOSN]=0;
- LNPOSN=LNPOSN+1;
- }
- goto L395;
-
-L380:
- SHFTXT(LNPOSN+2,-2);
- state=0;
- casemake= -1;
- if (PRMTYP == 31)
- casemake=1;
- if (PRMTYP == 33)
- casemake=0;
- I=LNPOSN;
- PUTTXT(PARMS[NPARMS],state,casemake);
- {long x = NPARMS+1; PUTTXT(PARMS[x],state,casemake);}
- if (PRMTYP == 13 && INLINE[I] >= 37 && INLINE[I] <=
- 62)INLINE[I]=INLINE[I]-26;
- NPARMS=NPARMS+2;
- goto L32;
-
-L40:
- if (blank)
- TYPE0();
- blank=false;
- TYPE();
- K=L+1;
- if (LINES[K] >= 0)
- goto L10;
+ nparms=1;
+ do {
+ nxt=labs(LINES[msg])-1;
+ msg=msg+1;
+ LNLENG=0;
+ LNPOSN=1;
+ state=0;
+ for (i = msg; i <= nxt; i++) {
+ PUTTXT(LINES[i],state,2);
+ }
+ LNPOSN=0;
+ ++LNPOSN;
+
+ while (LNPOSN <= LNLENG) {
+ if (INLINE[LNPOSN] != PERCENT) {
+ ++LNPOSN;
+ continue;
+ }
+ prmtyp = INLINE[LNPOSN+1];
+ /* A "%"; the next character determine the type of
+ * parameter: 1 (!) = suppress message completely, 29 (S) = NULL
+ * If PARAM=1, else 'S' (optional plural ending), 33 (W) = word
+ * (two 30-bit values) with trailing spaces suppressed, 22 (L) or
+ * 31 (U) = word but map to lower/upper case, 13 (C) = word in
+ * lower case with first letter capitalised, 30 (T) = text ending
+ * with a word of -1, 65-73 (1-9) = number using that many
+ * characters, 12 (B) = variable number of blanks. */
+ if (prmtyp == 1)
+ return;
+ if (prmtyp == 29) {
+ SHFTXT(LNPOSN+2,-1);
+ INLINE[LNPOSN] = 55;
+ if (PARMS[nparms] == 1)
+ SHFTXT(LNPOSN+1,-1);
+ ++nparms;
+ continue;
+ }
+ if (prmtyp == 30) {
+ SHFTXT(LNPOSN+2,-2);
+ state=0;
+ casemake=2;
+
+ while (PARMS[nparms] > 0) {
+ if (PARMS[nparms+1] < 0)
+ casemake=0;
+ PUTTXT(PARMS[nparms],state,casemake);
+ nparms=nparms+1;
+ }
+ ++nparms;
+ continue;
+ }
+ if (prmtyp == 12) {
+ prmtyp=PARMS[nparms];
+ SHFTXT(LNPOSN+2,prmtyp-2);
+ if (prmtyp != 0) {
+ for (i=1; i<=prmtyp; i++) {
+ INLINE[LNPOSN]=0;
+ ++LNPOSN;
+ }
+ }
+ ++nparms;
+ continue;
+ }
+ if (prmtyp == 33 || prmtyp == 22 || prmtyp == 31 || prmtyp == 13) {
+ SHFTXT(LNPOSN+2,-2);
+ state = 0;
+ casemake = -1;
+ if (prmtyp == 31)
+ casemake=1;
+ if (prmtyp == 33)
+ casemake=0;
+ i = LNPOSN;
+ PUTTXT(PARMS[nparms],state,casemake);
+ PUTTXT(PARMS[nparms+1],state,casemake);
+ if (prmtyp == 13 && INLINE[i] >= 37 && INLINE[i] <= 62)
+ INLINE[i] -= 26;
+ nparms += 2;
+ continue;
+ }
+
+ prmtyp=prmtyp-64;
+ if (prmtyp < 1 || prmtyp > 9) {
+ ++LNPOSN;
+ continue;
+ }
+ SHFTXT(LNPOSN+2,prmtyp-2);
+ LNPOSN += prmtyp;
+ param=labs(PARMS[nparms]);
+ neg=0;
+ if (PARMS[nparms] < 0)
+ neg=9;
+ for (i=1; i <= prmtyp; i++) {
+ --LNPOSN;
+ INLINE[LNPOSN]=MOD(param,10)+64;
+ if (i != 1 && param == 0) {
+ INLINE[LNPOSN]=neg;
+ neg=0;
+ }
+ param=param/10;
+ }
+ LNPOSN += prmtyp;
+ ++nparms;
+ continue;
+ }
+
+ if (blank)
+ TYPE0();
+ blank=false;
+ TYPE();
+ msg = nxt + 1;
+ } while
+ (LINES[msg] >= 0);
}
void PSPEAK(vocab_t msg,int skip)
m=PTEXT[msg];
if (skip >= 0) {
- for (i=0; i<=skip; i++) {
-L1: m=labs(LINES[m]);
- if (LINES[m] >= 0)
- goto L1;
+ for (i=0; i <=skip; i++) {
+ do {
+ m=labs(LINES[m]);
+ } while
+ (LINES[m] >= 0);
}
}
SPEAK(m);
}
+
void RSPEAK(vocab_t i)
/* Print the i-th "random" message (section 6 of database). */
{
}
}
-#define WORD1 (*wORD1)
-#define WORD1X (*wORD1X)
-#define WORD2 (*wORD2)
-#define WORD2X (*wORD2X)
-bool fGETIN(FILE *input, long *wORD1, long *wORD1X, long *wORD2, long *wORD2X)
+bool fGETIN(FILE *input,
+ long *pword1, long *pword1x,
+ long *pword2, long *pword2x)
/* Get a command from the adventurer. Snarf out the first word, pad it with
* blanks, and return it in WORD1. Chars 6 thru 10 are returned in WORD1X, in
* case we need to print out the whole word in an error message. Any number of
MAPLIN(input);
if (feof(input))
return false;
- WORD1=GETTXT(true,true,true);
- if (game.blklin && WORD1 < 0)
+ *pword1=GETTXT(true,true,true);
+ if (game.blklin && *pword1 < 0)
continue;
- WORD1X=GETTXT(false,true,true);
+ *pword1x=GETTXT(false,true,true);
do {
junk=GETTXT(false,true,true);
} while
(junk > 0);
- WORD2=GETTXT(true,true,true);
- WORD2X=GETTXT(false,true,true);
+ *pword2=GETTXT(true,true,true);
+ *pword2x=GETTXT(false,true,true);
do {
junk=GETTXT(false,true,true);
} while
if (LNPOSN > LNLENG || (onewrd && INLINE[LNPOSN] == 0))
continue;
char current=INLINE[LNPOSN];
- if (current < 63) {
+ if (current < PERCENT) {
splitting = -1;
if (upper && current >= 37)
current=current-26;
continue;
}
if (splitting != LNPOSN) {
- text=text+63;
+ text=text+PERCENT;
splitting = LNPOSN;
continue;
}
- text=text+current-63;
+ text=text+current-PERCENT;
splitting = -1;
LNPOSN=LNPOSN+1;
}
if (w <= 0 && *state == 0 && labs(casemake) <= 1)
return;
byte=w/div;
- if (!(*state != 0 || byte != 63)) {
- *state=63;
- goto L18;
+ w=(w-byte*div)*64;
+ if (!(*state != 0 || byte != PERCENT)) {
+ *state=PERCENT;
+ continue;
}
SHFTXT(LNPOSN,1);
*state=*state+byte;
INLINE[LNPOSN]=*state;
LNPOSN=LNPOSN+1;
*state=0;
-L18: w=(w-byte*div)*64;
}
}
#define PUTTXT(WORD,STATE,CASE) fPUTTXT(WORD,&STATE,CASE)
long from;
if (object > NOBJECTS)
- goto L1;
- from=game.place[object];
- goto L2;
-L1:
- from=game.fixed[object-NOBJECTS];
-L2:
+ from=game.fixed[object-NOBJECTS];
+ else
+ from=game.place[object];
if (from > 0 && from <= 300)
CARRY(object,from);
DROP(object,where);
return;
}
temp=game.atloc[where];
-L7: if (game.link[temp] == object)
- goto L8;
- temp=game.link[temp];
- goto L7;
-L8: game.link[temp]=game.link[object];
+ while (game.link[temp] != object) {
+ temp=game.link[temp];
+ }
+ game.link[temp]=game.link[object];
}
void DROP(long object, long where)
* game.holdng if the object was being toted. */
{
if (object > NOBJECTS)
- goto L1;
- if (game.place[object] == -1)
- game.holdng=game.holdng-1;
- game.place[object]=where;
- goto L2;
-L1: game.fixed[object-NOBJECTS]=where;
-L2: if (where <= 0)
+ game.fixed[object-NOBJECTS] = where;
+ else
+ {
+ if (game.place[object] == -1)
+ --game.holdng;
+ game.place[object] = where;
+ }
+ if (where <= 0)
return;
- game.link[object]=game.atloc[where];
- game.atloc[where]=object;
+ game.link[object] = game.atloc[where];
+ game.atloc[where] = object;
}
long ATDWRF(long where)
long SETBIT(long bit)
/* Returns 2**bit for use in constructing bit-masks. */
{
- return(2 << bit);
+ return(1 << bit);
}
bool TSTBIT(long mask, int bit)
* automatically. Finishing reading can be a no-op as long as a subsequent
* SAVEIO(0,false,X) will still work.) */
{
- static FILE *fp = NULL;
- char name[50];
+ static FILE *fp = NULL;
+ char* name;
switch (op < 0 ? -1 : (op > 0 ? 1 : 0))
{
break;
case 0:
while (fp == NULL) {
- printf("\nFile name: ");
- IGNORE(fgets(name, sizeof(name), stdin));
+ name = linenoise("File name: ");
fp = fopen(name,(in ? READ_MODE : WRITE_MODE));
if (fp == NULL)
printf("Can't open file %s, try again.\n", name);
}
+ linenoiseFree(name);
break;
case 1:
if (in)