libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-10 20:01:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

GLK: AGT: Convert 2-word synonims to canonical form

Browse Source 
Rewrite metacommands that apply to built-in two-word synonims
for standard verbs into the canonical form of these verbs, so
that the metacommand runs when the command is entered
This commit is contained in:
Walter Agazzi 2022-09-24 20:23:19 +02:00 committed by Paul Gilbert
parent 856841df80
commit 8c5a1d1e37
2 changed files with 36 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
engines/glk/agt/agtread.cpp
View File

@ -549,6 +549,39 @@ static int translate_vnum(int vnum)
return vnum;
}
static word check_comb(int combptr, int verbcmd, int nouncmd) {
word w;
if (combptr == 0) return 0;
w = syntbl[combptr];
if (syntbl[combptr+1] != verbcmd) return 0;
if (syntbl[combptr+2] != nouncmd) return 0;
if (syntbl[combptr+3] == 0) return w;
return 0;
}
/* For metacommands that apply to built-in two-word synonyms (e.g. GET OUT),
change the command to apply to the canonical form. */
void command_syn_canon(cmd_rec* cmd) {
int i, vb;
word w;
/* VERB NOUN only */
if(cmd->verbcmd > 0 && cmd->nouncmd > 0 && cmd->prep == 0 && cmd->objcmd == 0) {
for(i = 0; i < num_auxcomb; i++) {
w = check_comb(auxcomb[i], cmd->verbcmd, cmd->nouncmd);
if (w > 0) {
vb = verb_builtin(w);
if(vb > 0) {
cmd->verbcmd = syntbl[auxsyn[vb]];
cmd->nouncmd = 0;
}
}
}
}
}
#define CREC_SIZE (FRS_CMD)
@ -591,6 +624,7 @@ static void read_da5(fc_type fc) {
cmd_ptr[i] = (long)buff[bp] + (((long)buff[bp + 1]) << 8);
bp += 2;
}
command_syn_canon(command+i);
}
if (DIAG)
rprintf(" Internal:%ld\n", bp);
@ -1691,6 +1725,7 @@ static void finish_read(rbool cleanup)
}
}
/* Set the flag number for nouns mentioned in the flag_noun list */
int flagnum = 1;
for (i = 0; i <MAX_FLAG_NOUN; i++) {
if (flag_noun[i] != 0) {

2
engines/glk/agt/gamedata.cpp
View File

@ -1211,7 +1211,7 @@ void sort_cmd(void) {
}
#ifdef SORT_META
if (!agx_file && aver >= AGX00) rsort();
if (!agx_file) rsort();
#endif