X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=actions.c;h=e7574be4f2ce3c0e32af03376c98a04306cc25af;hb=b2a686b07def29a898fee83ab1e3a4a4f2ebd3eb;hp=5ead1f22d234ed0e259a3d5981c09af74829ff8d;hpb=603f548a215a0118dc3270d094671199eb28beab;p=open-adventure.git diff --git a/actions.c b/actions.c index 5ead1f2..e7574be 100644 --- a/actions.c +++ b/actions.c @@ -173,51 +173,58 @@ static int attack(struct command_t *command) rspeak(ROCKY_TROLL); break; default: - rspeak(actions[verb].message); + speak(actions[verb].message); } return GO_CLEAROBJ; } -static int bigwords(token_t foo) +static int bigwords(long id) /* FEE FIE FOE FOO (AND FUM). Advance to next state if given in proper order. * Look up foo in special section of vocab to determine which word we've got. * Last word zips the eggs back to the giant room (unless already there). */ { - char word[TOKLEN + 1]; - packed_to_token(foo, word); - int k = (int) get_special_vocab_id(word); - if (game.foobar != 1 - k) { - if (game.foobar != 0 && game.loc == LOC_GIANTROOM) { - rspeak( START_OVER); - } else { - rspeak(NOTHING_HAPPENS); - } - return GO_CLEAROBJ; - } else { - game.foobar = k; - if (k != 4) { - rspeak(OK_MAN); - return GO_CLEAROBJ; - } - game.foobar = 0; - if (game.place[EGGS] == objects[EGGS].plac || - (TOTING(EGGS) && game.loc == objects[EGGS].plac)) { - rspeak(NOTHING_HAPPENS); - return GO_CLEAROBJ; - } else { - /* Bring back troll if we steal the eggs back from him before - * crossing. */ - if (game.place[EGGS] == LOC_NOWHERE && game.place[TROLL] == LOC_NOWHERE && game.prop[TROLL] == TROLL_UNPAID) - game.prop[TROLL] = TROLL_PAIDONCE; - k = EGGS_DONE; - if (HERE(EGGS)) - k = EGGS_VANISHED; - if (game.loc == objects[EGGS].plac) - k = EGGS_HERE; - move(EGGS, objects[EGGS].plac); - pspeak(EGGS, look, k, true); - return GO_CLEAROBJ; - } + if ((game.foobar == WORD_EMPTY && id == ACTION_WORD(FEE)) || + (game.foobar == ACTION_WORD(FEE) && id == ACTION_WORD(FIE)) || + (game.foobar == ACTION_WORD(FIE) && id == ACTION_WORD(FOE)) || + (game.foobar == ACTION_WORD(FOE) && id == ACTION_WORD(FOO)) || + (game.foobar == ACTION_WORD(FOE) && id == ACTION_WORD(FUM))) + { + game.foobar = id; + if ((id != ACTION_WORD(FOO)) && (id != ACTION_WORD(FUM))) { + rspeak(OK_MAN); + return GO_CLEAROBJ; + } + game.foobar = WORD_EMPTY; + if (game.place[EGGS] == objects[EGGS].plac || + (TOTING(EGGS) && game.loc == objects[EGGS].plac)) { + rspeak(NOTHING_HAPPENS); + return GO_CLEAROBJ; + } else { + /* Bring back troll if we steal the eggs back from him before + * crossing. */ + if (game.place[EGGS] == LOC_NOWHERE && game.place[TROLL] == LOC_NOWHERE && game.prop[TROLL] == TROLL_UNPAID) + game.prop[TROLL] = TROLL_PAIDONCE; + int k = EGGS_DONE; + if (HERE(EGGS)) + k = EGGS_VANISHED; + if (game.loc == objects[EGGS].plac) + k = EGGS_HERE; + move(EGGS, objects[EGGS].plac); + pspeak(EGGS, look, k, true); + return GO_CLEAROBJ; + } + } + else + { + if (game.loc == LOC_GIANTROOM) { + rspeak(START_OVER); + } else { + /* This is new begavior in Open Adventure - sounds better when + * player isn't in the Giant Room. */ + rspeak(WELL_POINTLESS); + } + game.foobar = WORD_EMPTY; + return GO_CLEAROBJ; } } @@ -257,7 +264,7 @@ static int vbreak(token_t verb, token_t obj) game.fixed[VASE] = IS_FIXED; return GO_CLEAROBJ; } - rspeak(actions[verb].message); + speak(actions[verb].message); return (GO_CLEAROBJ); } @@ -444,7 +451,7 @@ static int discard(token_t verb, token_t obj, bool just_do_it) if (TOTING(ROD2) && obj == ROD && !TOTING(ROD)) obj = ROD2; if (!TOTING(obj)) { - rspeak(actions[verb].message); + speak(actions[verb].message); return GO_CLEAROBJ; } if (obj == BIRD && HERE(SNAKE)) { @@ -545,7 +552,7 @@ static int drink(token_t verb, token_t obj) return GO_CLEAROBJ; } - rspeak(actions[verb].message); + speak(actions[verb].message); return GO_CLEAROBJ; } @@ -577,7 +584,7 @@ static int eat(token_t verb, token_t obj) rspeak(LOST_APPETITE); return GO_CLEAROBJ; } - rspeak(actions[verb].message); + speak(actions[verb].message); return GO_CLEAROBJ; } @@ -616,7 +623,7 @@ static int extinguish(token_t verb, int obj) return GO_CLEAROBJ; } - rspeak(actions[verb].message); + speak(actions[verb].message); return GO_CLEAROBJ; } @@ -628,7 +635,6 @@ static int feed(token_t verb, token_t obj) case BIRD: rspeak(BIRD_PINING); break; - case DRAGON: if (game.prop[DRAGON] != DRAGON_BARS) rspeak(RIDICULOUS_ATTEMPT); @@ -650,7 +656,7 @@ static int feed(token_t verb, token_t obj) game.dflag += 2; rspeak(REALLY_MAD); } else - rspeak(actions[verb].message); + speak(actions[verb].message); break; case BEAR: if (game.prop[BEAR] == BEAR_DEAD) { @@ -665,13 +671,15 @@ static int feed(token_t verb, token_t obj) state_change(BEAR, SITTING_BEAR); } else rspeak(NOTHING_EDIBLE); + break; } + speak(actions[verb].message); break; case OGRE: if (HERE(FOOD)) rspeak(OGRE_FULL); else - rspeak(actions[verb].message); + speak(actions[verb].message); break; default: rspeak(AM_GAME); @@ -727,7 +735,7 @@ int fill(token_t verb, token_t obj) return GO_CLEAROBJ; } if (obj != NO_OBJECT && obj != BOTTLE) { - rspeak(actions[verb].message); + speak(actions[verb].message); return GO_CLEAROBJ; } if (obj == NO_OBJECT && !HERE(BOTTLE)) @@ -776,7 +784,7 @@ static int find(token_t verb, token_t obj) } - rspeak(actions[verb].message); + speak(actions[verb].message); return GO_CLEAROBJ; } @@ -796,7 +804,7 @@ static int fly(token_t verb, token_t obj) } if (obj != RUG) { - rspeak(actions[verb].message); + speak(actions[verb].message); return GO_CLEAROBJ; } if (game.prop[RUG] != RUG_HOVER) { @@ -805,12 +813,12 @@ static int fly(token_t verb, token_t obj) } game.oldlc2 = game.oldloc; game.oldloc = game.loc; - /* FIXME: Arithmetic on location values */ - game.newloc = game.place[RUG] + game.fixed[RUG] - game.loc; if (game.prop[SAPPH] == STATE_NOTFOUND) { + game.newloc = game.place[SAPPH]; rspeak(RUG_GOES); } else { + game.newloc = LOC_CLIFF; rspeak(RUG_RETURNS); } return GO_TERMINATE; @@ -858,7 +866,7 @@ static int light(token_t verb, token_t obj) return GO_CLEAROBJ; } else { if (obj != LAMP) { - rspeak(actions[verb].message); + speak(actions[verb].message); return GO_CLEAROBJ; } if (game.limit < 0) { @@ -976,7 +984,7 @@ static int lock(token_t verb, token_t obj) rspeak(CANNOT_UNLOCK); break; default: - rspeak(actions[verb].message); + speak(actions[verb].message); } return GO_CLEAROBJ; @@ -992,7 +1000,7 @@ static int pour(token_t verb, token_t obj) if (obj == NO_OBJECT) return GO_UNKNOWN; if (!TOTING(obj)) { - rspeak(actions[verb].message); + speak(actions[verb].message); return GO_CLEAROBJ; } @@ -1056,7 +1064,7 @@ static int read(struct command_t command) game.clshnt = yes(arbitrary_messages[CLUE_QUERY], arbitrary_messages[WAYOUT_CLUE], arbitrary_messages[OK_MAN]); } else if (objects[command.obj].texts[0] == NULL || game.prop[command.obj] < 0) { - rspeak(actions[command.verb].message); + speak(actions[command.verb].message); } else pspeak(command.obj, study, game.prop[command.obj], true); return GO_CLEAROBJ; @@ -1096,7 +1104,7 @@ static int rub(token_t verb, token_t obj) } else if (obj != LAMP) { rspeak(PECULIAR_NOTHING); } else { - rspeak(actions[verb].message); + speak(actions[verb].message); } return GO_CLEAROBJ; } @@ -1114,7 +1122,11 @@ static int say(struct command_t *command) if (wd == MOTION_WORD(XYZZY) || wd == MOTION_WORD(PLUGH) || wd == MOTION_WORD(PLOVER) || - wd == ACTION_WORD(GIANTWORDS) || + wd == ACTION_WORD(FEE) || + wd == ACTION_WORD(FIE) || + wd == ACTION_WORD(FOE) || + wd == ACTION_WORD(FOO) || + wd == ACTION_WORD(FUM) || wd == ACTION_WORD(PART)) { /* FIXME: scribbles on the interpreter's command block */ wordclear(&command->wd2); @@ -1138,7 +1150,7 @@ static int throw (struct command_t *command) * troll. Treasures special for troll. */ { if (!TOTING(command->obj)) { - rspeak(actions[command->verb].message); + speak(actions[command->verb].message); return GO_CLEAROBJ; } if (objects[command->obj].is_treasure && AT(TROLL)) { @@ -1197,7 +1209,7 @@ static int wake(token_t verb, token_t obj) { if (obj != DWARF || !game.closed) { - rspeak(actions[verb].message); + speak(actions[verb].message); return GO_CLEAROBJ; } else { rspeak(PROD_DWARF); @@ -1213,9 +1225,9 @@ static int wave(token_t verb, token_t obj) (!HERE(BIRD) && (game.closng || !AT(FISSURE)))) { - rspeak(((!TOTING(obj)) && (obj != ROD || + speak(((!TOTING(obj)) && (obj != ROD || !TOTING(ROD2))) ? - ARENT_CARRYING : + arbitrary_messages[ARENT_CARRYING] : actions[verb].message); return GO_CLEAROBJ; } @@ -1344,7 +1356,7 @@ int action(struct command_t *command) case TAME: return GO_UNKNOWN; case GO: { - rspeak(actions[command->verb].message); + speak(actions[command->verb].message); return GO_CLEAROBJ; } case ATTACK: @@ -1375,8 +1387,12 @@ int action(struct command_t *command) case SCORE: score(scoregame); return GO_CLEAROBJ; - case GIANTWORDS: - return bigwords(command->wd1); + case FEE: + case FIE: + case FOE: + case FOO: + case FUM: + return bigwords(command->id1); case BRIEF: return brief(); case READ: @@ -1425,11 +1441,11 @@ int action(struct command_t *command) case WAVE: return wave(command->verb, command->obj); case TAME: { - rspeak(actions[command->verb].message); + speak(actions[command->verb].message); return GO_CLEAROBJ; } case GO: { - rspeak(actions[command->verb].message); + speak(actions[command->verb].message); return GO_CLEAROBJ; } case ATTACK: @@ -1445,7 +1461,7 @@ int action(struct command_t *command) case THROW: return throw (command); case QUIT: { - rspeak(actions[command->verb].message); + speak(actions[command->verb].message); return GO_CLEAROBJ; } case FIND: @@ -1460,15 +1476,19 @@ int action(struct command_t *command) blast(); return GO_CLEAROBJ; case SCORE: { - rspeak(actions[command->verb].message); + speak(actions[command->verb].message); return GO_CLEAROBJ; } - case GIANTWORDS: { - rspeak(actions[command->verb].message); + case FEE: + case FIE: + case FOE: + case FOO: + case FUM: { + speak(actions[command->verb].message); return GO_CLEAROBJ; } case BRIEF: { - rspeak(actions[command->verb].message); + speak(actions[command->verb].message); return GO_CLEAROBJ; } case READ: @@ -1478,17 +1498,17 @@ int action(struct command_t *command) case WAKE: return wake(command->verb, command->obj); case SAVE: { - rspeak(actions[command->verb].message); + speak(actions[command->verb].message); return GO_CLEAROBJ; } case RESUME: { - rspeak(actions[command->verb].message); + speak(actions[command->verb].message); return GO_CLEAROBJ; } case FLY: return fly(command->verb, command->obj); case LISTEN: { - rspeak(actions[command->verb].message); + speak(actions[command->verb].message); return GO_CLEAROBJ; } case PART: