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

Further code simplification.

Browse source
This commit is contained in:
Eric S. Raymond 2017-06-20 20:44:21 -04:00
parent 237f1a876f
commit e798355e80
1 changed files with 6 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

16
actions.c
View file

@ -798,23 +798,19 @@ static int read(struct command_t command)
if (HERE(i) && OBJTXT[i] != 0 && game.prop[i] >= 0) if (HERE(i) && OBJTXT[i] != 0 && game.prop[i] >= 0)
command.obj = command.obj * NOBJECTS + i; command.obj = command.obj * NOBJECTS + i;
} }
if (command.obj > NOBJECTS || command.obj == 0 || DARK(game.loc)) return GO_UNKNOWN; if (command.obj > NOBJECTS || command.obj == 0 || DARK(game.loc))
return GO_UNKNOWN;
} }
if (DARK(game.loc)) { if (DARK(game.loc)) {
SETPRM(1, command.wd1, command.wd1x); SETPRM(1, command.wd1, command.wd1x);
RSPEAK(NO_SEE); RSPEAK(NO_SEE);
return GO_CLEAROBJ; } else if (OBJTXT[command.obj] == 0 || game.prop[command.obj] < 0) {
}
if (OBJTXT[command.obj] == 0 || game.prop[command.obj] < 0) {
RSPEAK(ACTSPK[command.verb]); RSPEAK(ACTSPK[command.verb]);
return GO_CLEAROBJ; } else if (command.obj == OYSTER && !game.clshnt) {
}
if (command.obj == OYSTER && !game.clshnt) {
game.clshnt = YES(arbitrary_messages[CLUE_QUERY], arbitrary_messages[WAYOUT_CLUE], arbitrary_messages[OK_MAN]); game.clshnt = YES(arbitrary_messages[CLUE_QUERY], arbitrary_messages[WAYOUT_CLUE], arbitrary_messages[OK_MAN]);
return GO_CLEAROBJ; } else
} PSPEAK(command.obj, OBJTXT[command.obj] + game.prop[command.obj]);
PSPEAK(command.obj, OBJTXT[command.obj] + game.prop[command.obj]);
return GO_CLEAROBJ; return GO_CLEAROBJ;
} }