X-Git-Url: https://jxself.org/git/?p=open-adventure.git;a=blobdiff_plain;f=main.c;h=1a1f25d63bf90f02ae97554860138ddc12159bdb;hp=66f63f993dc32a845689dd817851acd570a9dcb7;hb=4e01669e06cebde88437935fd2b2938406cddcb5;hpb=3f90f5bf3849116adaacde3dea72bd00b0819450 diff --git a/main.c b/main.c index 66f63f9..1a1f25d 100644 --- a/main.c +++ b/main.c @@ -1130,16 +1130,7 @@ Lclearobj: goto Lclearobj; } - /* Ugly translationms to get around word polyvalence. */ - if (command.type1 == ACTION && command.id1 == SAY - && command.id2 != WORD_NOT_FOUND && command.id2 != WORD_EMPTY) { - command.id1 = command.id2; - command.type1 = command.type2; - strncpy(command.raw1, command.raw2, LINESIZE - 1); - command.id2 = WORD_EMPTY; - command.type2 = NO_WORD_TYPE; - strncpy(command.raw2, "", LINESIZE - 1); - } else if (command.type1 == OBJECT) { + if (command.type1 == OBJECT) { if (!((command.id1 != WATER && command.id1 != OIL) || (command.id2 != PLANT && command.id2 != DOOR))) { if (AT(command.id2)) { command.id2 = POUR; @@ -1204,8 +1195,6 @@ Lookup: return true; case GO_TOP: continue; /* back to top of main interpreter loop */ - case GO_LOOKUP: - goto Lookup; case GO_WORD2: /* Get second word for analysis. */ command.id1 = command.id2;