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

Encapsulate command words into their own struct.

Browse source
This commit is contained in:
Jason S. Ninneman 2017-08-02 20:11:40 -07:00
parent a15e7c9f91
commit 5c91ea3739
4 changed files with 73 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

48
actions.c
View file

@ -1092,7 +1092,7 @@ static int read(struct command_t command)
} }
if (DARK(game.loc)) { if (DARK(game.loc)) {
sspeak(NO_SEE, command.raw1); sspeak(NO_SEE, command.word[0].raw);
} else if (command.obj == OYSTER && !game.clshnt && game.closed) { } else if (command.obj == OYSTER && !game.clshnt && game.closed) {
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]);
} else if (objects[command.obj].texts[0] == NULL || } else if (objects[command.obj].texts[0] == NULL ||
@ -1144,25 +1144,25 @@ static int rub(verb_t verb, obj_t obj)
static int say(struct command_t command) static int say(struct command_t command)
/* Say. Echo WD2. Magic words override. */ /* Say. Echo WD2. Magic words override. */
{ {
if (command.type2 == MOTION && if (command.word[1].type == MOTION &&
(command.id2 == XYZZY || (command.word[1].id == XYZZY ||
command.id2 == PLUGH || command.word[1].id == PLUGH ||
command.id2 == PLOVER)) { command.word[1].id == PLOVER)) {
return GO_WORD2; return GO_WORD2;
} }
if (command.type2 == ACTION && command.id2 == PART) if (command.word[1].type == ACTION && command.word[1].id == PART)
return reservoir(); return reservoir();
if (command.type2 == ACTION && if (command.word[1].type == ACTION &&
(command.id2 == FEE || (command.word[1].id == FEE ||
command.id2 == FIE || command.word[1].id == FIE ||
command.id2 == FOE || command.word[1].id == FOE ||
command.id2 == FOO || command.word[1].id == FOO ||
command.id2 == FUM || command.word[1].id == FUM ||
command.id2 == PART)) { command.word[1].id == PART)) {
return bigwords(command.id2); return bigwords(command.word[1].id);
} }
sspeak(OKEY_DOKEY, command.raw2); sspeak(OKEY_DOKEY, command.word[1].raw);
return GO_CLEAROBJ; return GO_CLEAROBJ;
} }
@ -1353,14 +1353,14 @@ int action(struct command_t command)
command.obj = ROD2; command.obj = ROD2;
/* FALL THROUGH */; /* FALL THROUGH */;
} else if ((command.verb == FIND || } else if ((command.verb == FIND ||
command.verb == INVENTORY) && (command.id2 == WORD_EMPTY || command.id2 == WORD_NOT_FOUND)) command.verb == INVENTORY) && (command.word[1].id == WORD_EMPTY || command.word[1].id == WORD_NOT_FOUND))
/* FALL THROUGH */; /* FALL THROUGH */;
else { else {
sspeak(NO_SEE, command.raw1); sspeak(NO_SEE, command.word[0].raw);
return GO_CLEAROBJ; return GO_CLEAROBJ;
} }
if (command.id2 != WORD_EMPTY && command.id2 != WORD_NOT_FOUND) if (command.word[1].id != WORD_EMPTY && command.word[1].id != WORD_NOT_FOUND)
return GO_WORD2; return GO_WORD2;
if (command.verb != 0) if (command.verb != 0)
command.part = transitive; command.part = transitive;
@ -1368,13 +1368,13 @@ int action(struct command_t command)
switch (command.part) { switch (command.part) {
case intransitive: case intransitive:
if (command.raw2[0] != '\0' && command.verb != SAY) if (command.word[1].raw[0] != '\0' && command.verb != SAY)
return GO_WORD2; return GO_WORD2;
if (command.verb == SAY) if (command.verb == SAY)
/* KEYS is not special, anything not NO_OBJECT or INTRANSITIVE /* KEYS is not special, anything not NO_OBJECT or INTRANSITIVE
* will do here. We're preventing interpretation as an intransitive * will do here. We're preventing interpretation as an intransitive
* verb when the word is unknown. */ * verb when the word is unknown. */
command.obj = command.raw2[0] != '\0' ? KEYS : NO_OBJECT; command.obj = command.word[1].raw[0] != '\0' ? KEYS : NO_OBJECT;
if (command.obj == NO_OBJECT || if (command.obj == NO_OBJECT ||
command.obj == INTRANSITIVE) { command.obj == INTRANSITIVE) {
/* Analyse an intransitive verb (ie, no object given yet). */ /* Analyse an intransitive verb (ie, no object given yet). */
@ -1439,7 +1439,7 @@ int action(struct command_t command)
case FOE: case FOE:
case FOO: case FOO:
case FUM: case FUM:
return bigwords(command.id1); return bigwords(command.word[0].id);
case BRIEF: case BRIEF:
return brief(); return brief();
case READ: case READ:
@ -1568,15 +1568,15 @@ int action(struct command_t command)
return reservoir(); return reservoir();
// LCOV_EXCL_STOP // LCOV_EXCL_STOP
case SEED: case SEED:
return seed(command.verb, command.raw2); return seed(command.verb, command.word[1].raw);
case WASTE: case WASTE:
return waste(command.verb, (turn_t)atol(command.raw2)); return waste(command.verb, (turn_t)atol(command.word[1].raw));
default: // LCOV_EXCL_LINE default: // LCOV_EXCL_LINE
BUG(TRANSITIVE_ACTION_VERB_EXCEEDS_GOTO_LIST); // LCOV_EXCL_LINE BUG(TRANSITIVE_ACTION_VERB_EXCEEDS_GOTO_LIST); // LCOV_EXCL_LINE
} }
case unknown: case unknown:
/* Unknown verb, couldn't deduce object - might need hint */ /* Unknown verb, couldn't deduce object - might need hint */
sspeak(WHAT_DO, command.raw1); sspeak(WHAT_DO, command.word[0].raw);
return GO_CHECKHINT; return GO_CHECKHINT;
default: // LCOV_EXCL_LINE default: // LCOV_EXCL_LINE
BUG(SPEECHPART_NOT_TRANSITIVE_OR_INTRANSITIVE_OR_UNKNOWN); // LCOV_EXCL_LINE BUG(SPEECHPART_NOT_TRANSITIVE_OR_INTRANSITIVE_OR_UNKNOWN); // LCOV_EXCL_LINE

7
advent.h
View file

@ -184,17 +184,14 @@ struct settings_t {
}; };
typedef struct { typedef struct {
char raw[LINESIZE];
vocab_t id; vocab_t id;
word_type_t type; word_type_t type;
} command_word_t; } command_word_t;
struct command_t { struct command_t {
char raw1[LINESIZE], raw2[LINESIZE];
enum speechpart part; enum speechpart part;
vocab_t id1; command_word_t word[2];
vocab_t id2;
word_type_t type1;
word_type_t type2;
verb_t verb; verb_t verb;
obj_t obj; obj_t obj;
}; };

78
main.c
View file

@ -1059,14 +1059,14 @@ Lclearobj:
return false; return false;
#ifdef GDEBUG #ifdef GDEBUG
printf("Preserve: type1 = %u, id1 = %ld, type2 = %u id2 = %ld\n", printf("Preserve: type1 = %u, id1 = %ld, type2 = %u, id2 = %ld\n",
preserve.type1, preserve.id1, preserve.type2, preserve.id2); preserve.word[0].type, preserve.word[0].id, preserve.word[1].type, preserve.word[1].id);
printf("Command: type1 = %u, id1 = %ld, type2 = %u id2 = %ld\n", printf("Command: type1 = %u, id1 = %ld, type2 = %u, id2 = %ld\n",
command.type1, command.id1, command.type2, command.id2); command.word[0].type, command.word[0].id, command.word[1].type, command.word[1].id);
#endif #endif
/* Handling of objectless action followed by actionless object */ /* Handle of objectless action followed by actionless object */
if (preserve.type1 == ACTION && preserve.type2 == NO_WORD_TYPE && command.id2 == 0) if (preserve.word[0].type == ACTION && preserve.word[1].type == NO_WORD_TYPE && command.word[1].id == 0)
command.verb = preserve.verb; command.verb = preserve.verb;
#ifdef BROKEN #ifdef BROKEN
@ -1083,8 +1083,8 @@ Lclearobj:
} else } else
lampcheck(); lampcheck();
if (command.type1 == MOTION && command.id1 == ENTER if (command.word[0].type == MOTION && command.word[0].id == ENTER
&& (command.id2 == STREAM || command.id2 == WATER)) { && (command.word[1].id == STREAM || command.word[1].id == WATER)) {
if (LIQLOC(game.loc) == WATER) if (LIQLOC(game.loc) == WATER)
rspeak(FEET_WET); rspeak(FEET_WET);
else else
@ -1093,65 +1093,65 @@ Lclearobj:
goto Lclearobj; goto Lclearobj;
} }
if (command.type1 == OBJECT) { if (command.word[0].type == OBJECT) {
if (command.id1 == GRATE) { if (command.word[0].id == GRATE) {
command.type1 = MOTION; command.word[0].type = MOTION;
if (game.loc == LOC_START || if (game.loc == LOC_START ||
game.loc == LOC_VALLEY || game.loc == LOC_VALLEY ||
game.loc == LOC_SLIT) { game.loc == LOC_SLIT) {
command.id1 = DEPRESSION; command.word[0].id = DEPRESSION;
} }
if (game.loc == LOC_COBBLE || if (game.loc == LOC_COBBLE ||
game.loc == LOC_DEBRIS || game.loc == LOC_DEBRIS ||
game.loc == LOC_AWKWARD || game.loc == LOC_AWKWARD ||
game.loc == LOC_BIRD || game.loc == LOC_BIRD ||
game.loc == LOC_PITTOP) { game.loc == LOC_PITTOP) {
command.id1 = ENTRANCE; command.word[0].id = ENTRANCE;
} }
} }
if (!((command.id1 != WATER && command.id1 != OIL) || (command.id2 != PLANT && command.id2 != DOOR))) { if (!((command.word[0].id != WATER && command.word[0].id != OIL) || (command.word[1].id != PLANT && command.word[1].id != DOOR))) {
if (AT(command.id2)) { if (AT(command.word[1].id)) {
command.id2 = POUR; command.word[1].id = POUR;
command.type2 = ACTION; command.word[1].type = ACTION;
strncpy(command.raw2, "POUR", LINESIZE - 1); strncpy(command.word[1].raw, "POUR", LINESIZE - 1);
} }
} }
if (command.id1 == CAGE && command.id2 == BIRD && HERE(CAGE) && HERE(BIRD)) { if (command.word[0].id == CAGE && command.word[1].id == BIRD && HERE(CAGE) && HERE(BIRD)) {
command.id1 = CARRY; command.word[0].id = CARRY;
command.type1 = ACTION; command.word[0].type = ACTION;
strncpy(command.raw2, "CATCH", LINESIZE - 1); strncpy(command.word[1].raw, "CATCH", LINESIZE - 1);
} }
} }
Lookup: Lookup:
if (strncasecmp(command.raw1, "west", sizeof("west")) == 0) { if (strncasecmp(command.word[0].raw, "west", sizeof("west")) == 0) {
if (++game.iwest == 10) if (++game.iwest == 10)
rspeak(W_IS_WEST); rspeak(W_IS_WEST);
} }
if (strncasecmp(command.raw1, "go", sizeof("go")) == 0 && command.id2 != WORD_EMPTY) { if (strncasecmp(command.word[0].raw, "go", sizeof("go")) == 0 && command.word[1].id != WORD_EMPTY) {
if (++game.igo == 10) if (++game.igo == 10)
rspeak(GO_UNNEEDED); rspeak(GO_UNNEEDED);
} }
if (command.id1 == WORD_NOT_FOUND) { if (command.word[0].id == WORD_NOT_FOUND) {
/* Gee, I don't understand. */ /* Gee, I don't understand. */
sspeak(DONT_KNOW, command.raw1); sspeak(DONT_KNOW, command.word[0].raw);
goto Lclearobj; goto Lclearobj;
} }
switch (command.type1) { switch (command.word[0].type) {
case NO_WORD_TYPE: // FIXME: treating NO_WORD_TYPE as a motion word is confusing case NO_WORD_TYPE: // FIXME: treating NO_WORD_TYPE as a motion word is confusing
case MOTION: case MOTION:
playermove(command.id1); playermove(command.word[0].id);
return true; return true;
case OBJECT: case OBJECT:
command.part = unknown; command.part = unknown;
command.obj = command.id1; command.obj = command.word[0].id;
break; break;
case ACTION: case ACTION:
if(command.type2 == NUMERIC) if(command.word[1].type == NUMERIC)
command.part = transitive; command.part = transitive;
else else
command.part = intransitive; command.part = intransitive;
command.verb = command.id1; command.verb = command.word[0].id;
break; break;
case NUMERIC: // LCOV_EXCL_LINE case NUMERIC: // LCOV_EXCL_LINE
default: // LCOV_EXCL_LINE default: // LCOV_EXCL_LINE
@ -1168,18 +1168,18 @@ Lookup:
continue; /* back to top of main interpreter loop */ continue; /* back to top of main interpreter loop */
case GO_WORD2: case GO_WORD2:
/* Get second word for analysis. */ /* Get second word for analysis. */
command.id1 = command.id2; command.word[0].id = command.word[1].id;
command.type1 = command.type2; command.word[0].type = command.word[1].type;
strncpy(command.raw1, command.raw2, LINESIZE - 1); strncpy(command.word[0].raw, command.word[1].raw, LINESIZE - 1);
command.id2 = WORD_EMPTY; command.word[1].id = WORD_EMPTY;
command.type2 = NO_WORD_TYPE; command.word[1].type = NO_WORD_TYPE;
command.raw2[0] = '\0'; command.word[1].raw[0] = '\0';
goto Lookup; goto Lookup;
case GO_UNKNOWN: case GO_UNKNOWN:
/* Random intransitive verbs come here. Clear obj just in case /* Random intransitive verbs come here. Clear obj just in case
* (see attack()). */ * (see attack()). */
command.raw1[0] = toupper(command.raw1[0]); command.word[0].raw[0] = toupper(command.word[0].raw[0]);
sspeak(DO_WHAT, command.raw1); sspeak(DO_WHAT, command.word[0].raw);
command.obj = 0; command.obj = 0;
// Fallthrough // Fallthrough
case GO_CHECKHINT: // Fallthrough case GO_CHECKHINT: // Fallthrough

16
misc.c
View file

@ -471,7 +471,7 @@ static void tokenize(char* raw, struct command_t *cmd)
/* Bound prefix on the %s would be needed to prevent buffer /* Bound prefix on the %s would be needed to prevent buffer
* overflow. but we shortstop this more simply by making each * overflow. but we shortstop this more simply by making each
* raw-input buffer as long as the entire input buffer. */ * raw-input buffer as long as the entire input buffer. */
sscanf(raw, "%s%s", cmd->raw1, cmd->raw2); sscanf(raw, "%s%s", cmd->word[0].raw, cmd->word[1].raw);
/* (ESR) In oldstyle mode, simulate the uppercasing and truncating /* (ESR) In oldstyle mode, simulate the uppercasing and truncating
* effect on raw tokens of packing them into sixbit characters, 5 * effect on raw tokens of packing them into sixbit characters, 5
@ -488,16 +488,16 @@ static void tokenize(char* raw, struct command_t *cmd)
* possible an emulation of the original UI. * possible an emulation of the original UI.
*/ */
if (settings.oldstyle) { if (settings.oldstyle) {
cmd->raw1[TOKLEN + TOKLEN] = cmd->raw2[TOKLEN + TOKLEN] = '\0'; cmd->word[0].raw[TOKLEN + TOKLEN] = cmd->word[1].raw[TOKLEN + TOKLEN] = '\0';
for (size_t i = 0; i < strlen(cmd->raw1); i++) for (size_t i = 0; i < strlen(cmd->word[0].raw); i++)
cmd->raw1[i] = toupper(cmd->raw1[i]); cmd->word[0].raw[i] = toupper(cmd->word[0].raw[i]);
for (size_t i = 0; i < strlen(cmd->raw2); i++) for (size_t i = 0; i < strlen(cmd->word[1].raw); i++)
cmd->raw2[i] = toupper(cmd->raw2[i]); cmd->word[1].raw[i] = toupper(cmd->word[1].raw[i]);
} }
/* populate command with parsed vocabulary metadata */ /* populate command with parsed vocabulary metadata */
get_vocab_metadata(cmd->raw1, &(cmd->id1), &(cmd->type1)); get_vocab_metadata(cmd->word[0].raw, &(cmd->word[0].id), &(cmd->word[0].type));
get_vocab_metadata(cmd->raw2, &(cmd->id2), &(cmd->type2)); get_vocab_metadata(cmd->word[1].raw, &(cmd->word[1].id), &(cmd->word[1].type));
} }
bool get_command_input(struct command_t *command) bool get_command_input(struct command_t *command)