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

Eliminated bivalve function.

Browse source 
Reason: only called in lock(), you can't be TOTING a clam, you can't
have the trident at a carryable oyster, and the code IMHO is more
readable this way.
This commit is contained in:
Aaron Traas 2017-07-04 09:55:02 -04:00
parent e1cca3b28a
commit 16a175bbab
3 changed files with 23 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

50
actions.c
View file

@ -210,38 +210,6 @@ static int bigwords(token_t foo)
}
}
static int bivalve(token_t verb, token_t obj)
/* Clam/oyster actions */
{
bool is_oyster = (obj == OYSTER);
if (verb == LOCK) {
rspeak(HUH_MAN);
return GO_CLEAROBJ;
}
if (!TOTING(TRIDENT)) {
rspeak(is_oyster ?
OYSTER_OPENER :
CLAM_OPENER);
return GO_CLEAROBJ;
}
if (TOTING(obj)) {
rspeak( is_oyster ?
DROP_OYSTER :
DROP_CLAM);
return GO_CLEAROBJ;
}
if (!is_oyster) {
DESTROY(CLAM);
drop(OYSTER, game.loc);
drop(PEARL, LOC_CULDESAC);
}
rspeak(is_oyster ?
OYSTER_OPENS :
PEARL_FALLS);
return GO_CLEAROBJ;
}
static void blast(void)
/* Blast. No effect unless you've got dynamite, which is a neat trick! */
{
@ -946,8 +914,24 @@ static int lock(token_t verb, token_t obj)
switch (obj) {
case CLAM:
if (verb == LOCK)
rspeak(HUH_MAN);
else if (!TOTING(TRIDENT))
rspeak(OYSTER_OPENER);
else {
DESTROY(CLAM);
drop(OYSTER, game.loc);
drop(PEARL, LOC_CULDESAC);
rspeak(PEARL_FALLS);
}
return GO_CLEAROBJ;
case OYSTER:
return bivalve(verb, obj);
if (verb == LOCK)
rspeak(HUH_MAN);
else
rspeak(OYSTER_OPENER);
return GO_CLEAROBJ;
case DOOR:
rspeak((game.prop[DOOR] == DOOR_UNRUSTED) ? OK_MAN : RUSTY_DOOR);
break;