- if (command.type1 == OBJECT) {
- if (command.id1 == GRATE) {
- command.type1 = MOTION;
- if (game.loc == LOC_START ||
- game.loc == LOC_VALLEY ||
- game.loc == LOC_SLIT) {
- command.id1 = DEPRESSION;
- }
- if (game.loc == LOC_COBBLE ||
- game.loc == LOC_DEBRIS ||
- game.loc == LOC_AWKWARD ||
- game.loc == LOC_BIRD ||
- game.loc == LOC_PITTOP) {
- command.id1 = ENTRANCE;
- }
- }
- if (!((command.id1 != WATER && command.id1 != OIL) || (command.id2 != PLANT && command.id2 != DOOR))) {
- if (AT(command.id2)) {
- command.id2 = POUR;
- command.type2 = ACTION;
- strncpy(command.raw2, "POUR", LINESIZE - 1);
+ if (command.word[0].type == OBJECT) {
+ if (command.word[0].id == GRATE) {
+ command.word[0].type = MOTION;
+ if (game.loc == LOC_START ||
+ game.loc == LOC_VALLEY ||
+ game.loc == LOC_SLIT) {
+ command.word[0].id = DEPRESSION;
+ }
+ if (game.loc == LOC_COBBLE ||
+ game.loc == LOC_DEBRIS ||
+ game.loc == LOC_AWKWARD ||
+ game.loc == LOC_BIRD ||
+ game.loc == LOC_PITTOP) {
+ command.word[0].id = ENTRANCE;
+ }
+ }
+ if (!((command.word[0].id != WATER && command.word[0].id != OIL) || (command.word[1].id != PLANT && command.word[1].id != DOOR))) {
+ if (AT(command.word[1].id)) {
+ command.word[1].id = POUR;
+ command.word[1].type = ACTION;
+ strncpy(command.word[1].raw, "POUR", LINESIZE - 1);