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

Fix handling of intransitive "say".

Browse source
This commit is contained in:
Eric S. Raymond 2017-06-14 15:15:00 -04:00
parent 6c6498b797
commit 7c9a0bfb36
3 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -14,7 +14,7 @@
VERS=1.0 VERS=1.0
CC?=gcc CC?=gcc
CCFLAGS+=-std=c99 -D _DEFAULT_SOURCE -Wall -Wpedantic CCFLAGS+=-std=c99 -D _DEFAULT_SOURCE -Wall -Wpedantic -g
LIBS= LIBS=
UNAME_S := $(shell uname -s) UNAME_S := $(shell uname -s)
ifeq ($(UNAME_S),Linux) ifeq ($(UNAME_S),Linux)

2
actions.c
View file

@ -1051,7 +1051,7 @@ int action(FILE *input, enum speechpart part, long verb, token_t obj)
case intransitive: case intransitive:
if (WD2 > 0 && verb != SAY) return(2800); if (WD2 > 0 && verb != SAY) return(2800);
if (verb == SAY)obj=WD2; if (verb == SAY)obj=WD2;
if (obj == 0) { if (obj == 0 || obj == INTRANSITIVE) {
/* Analyse an intransitive verb (ie, no object given yet). */ /* Analyse an intransitive verb (ie, no object given yet). */
switch (verb-1) { switch (verb-1) {
case 0: /* CARRY */ return carry(verb, INTRANSITIVE); case 0: /* CARRY */ return carry(verb, INTRANSITIVE);

4
tests/woodshint.chk
View file

@ -115,11 +115,11 @@ Drop what?
> say > say
Okay, "SAY". Say what?
> nothing > nothing
OK Okay, "NOTHI".
> wave > wave