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

Merge branch 'master' into actions-arithmetic

Browse source
This commit is contained in:
Peje Nilsson 2017-06-16 10:10:38 +02:00
commit d4fc7a88b4
9 changed files with 1549 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

4
actions.c
View file

@ -614,7 +614,7 @@ static int fly(token_t verb, token_t obj)
return GO_TERMINATE;
}
static int inven(token_t obj)
static int inven(void)
/* Inventory. If object, treat same as find. Else report on current burden. */
{
int spk=NO_CARRY;
@ -1087,7 +1087,7 @@ int action(FILE *input, enum speechpart part, long verb, token_t obj)
case 16: /* TOSS */ return GO_UNKNOWN;
case 17: /* QUIT */ return quit(input);
case 18: /* FIND */ return GO_UNKNOWN;
case 19: /* INVEN */ return inven(obj);
case 19: /* INVEN */ return inven();
case 20: /* FEED */ return GO_UNKNOWN;
case 21: /* FILL */ return fill(verb, obj);
case 22: /* BLAST */ return blast();