projects
/
open-adventure.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove unneeded vocabulary lookup.
[open-adventure.git]
/
actions.c
diff --git
a/actions.c
b/actions.c
index 46d09e1e8a84d7ee134c95aacf05bcd5485b7668..5433a7dad1c0839b90e09f4b2264a66302d64784 100644
(file)
--- a/
actions.c
+++ b/
actions.c
@@
-101,13
+101,9
@@
static int attack(struct command_t *command)
* fixed), move rug there (not fixed), and move him there,
* too. Then do a null motion to get new description. */
rspeak(BARE_HANDS_QUERY);
* fixed), move rug there (not fixed), and move him there,
* too. Then do a null motion to get new description. */
rspeak(BARE_HANDS_QUERY);
- if (silent_yes()) {
- // FIXME: setting wd1 is a workaround for broken logic
- command->wd1 = token_to_packed("Y");
- } else {
- // FIXME: setting wd1 is a workaround for broken logic
- command->wd1 = token_to_packed("N");
- return GO_CHECKFOO;
+ if (!silent_yes()) {
+ speak(arbitrary_messages[NASTY_DRAGON]);
+ return GO_MOVE;
}
state_change(DRAGON, DRAGON_DEAD);
game.prop[RUG] = RUG_FLOOR;
}
state_change(DRAGON, DRAGON_DEAD);
game.prop[RUG] = RUG_FLOOR;
@@
-205,15
+201,14
@@
static int bigwords(long id)
* crossing. */
if (game.place[EGGS] == LOC_NOWHERE && game.place[TROLL] == LOC_NOWHERE && game.prop[TROLL] == TROLL_UNPAID)
game.prop[TROLL] = TROLL_PAIDONCE;
* crossing. */
if (game.place[EGGS] == LOC_NOWHERE && game.place[TROLL] == LOC_NOWHERE && game.prop[TROLL] == TROLL_UNPAID)
game.prop[TROLL] = TROLL_PAIDONCE;
- int k;
if (HERE(EGGS))
if (HERE(EGGS))
-
k = EGGS_VANISHED
;
+
pspeak(EGGS, look, EGGS_VANISHED, true)
;
else if (game.loc == objects[EGGS].plac)
else if (game.loc == objects[EGGS].plac)
-
k = EGGS_HERE
;
+
pspeak(EGGS, look, EGGS_HERE, true)
;
else
else
-
k = EGGS_DONE
;
+
pspeak(EGGS, look, EGGS_DONE, true)
;
move(EGGS, objects[EGGS].plac);
move(EGGS, objects[EGGS].plac);
- pspeak(EGGS, look, k, true);
+
return GO_CLEAROBJ;
}
} else {
return GO_CLEAROBJ;
}
} else {
@@
-256,7
+251,7
@@
static int vbreak(verb_t verb, obj_t obj)
switch (obj) {
case MIRROR:
if (game.closed) {
switch (obj) {
case MIRROR:
if (game.closed) {
-
rspeak(BREAK_MIRROR
);
+
state_change(MIRROR, MIRROR_BROKEN
);
return GO_DWARFWAKE;
} else {
rspeak(TOO_FAR);
return GO_DWARFWAKE;
} else {
rspeak(TOO_FAR);
@@
-270,6
+265,7
@@
static int vbreak(verb_t verb, obj_t obj)
game.fixed[VASE] = IS_FIXED;
break;
}
game.fixed[VASE] = IS_FIXED;
break;
}
+ /* FALLTHRU */
default:
speak(actions[verb].message);
}
default:
speak(actions[verb].message);
}
@@
-420,8
+416,8
@@
static int chain(verb_t verb)
game.prop[BEAR] = CONTENTED_BEAR;
switch (game.prop[BEAR]) {
game.prop[BEAR] = CONTENTED_BEAR;
switch (game.prop[BEAR]) {
+ // LCOV_EXCL_START
case BEAR_DEAD:
case BEAR_DEAD:
- // LCOV_EXCL_START
/* Can't be reached as long as the only way for the bear to die
* is from a bridge collapse. Leave in in case this changes, but
* exclude from coverage testing. */
/* Can't be reached as long as the only way for the bear to die
* is from a bridge collapse. Leave in in case this changes, but
* exclude from coverage testing. */
@@
-548,9
+544,7
@@
static int discard(verb_t verb, obj_t obj)
} else
rspeak(OK_MAN);
} else
rspeak(OK_MAN);
- game.prop[BIRD] = BIRD_UNCAGED;
- if (FOREST(game.loc))
- game.prop[BIRD] = BIRD_FOREST_UNCAGED;
+ game.prop[BIRD] = FOREST(game.loc) ? BIRD_FOREST_UNCAGED : BIRD_UNCAGED;
drop(obj, game.loc);
return GO_CLEAROBJ;
}
drop(obj, game.loc);
return GO_CLEAROBJ;
}
@@
-598,6
+592,7
@@
static int eat(verb_t verb, obj_t obj)
case INTRANSITIVE:
if (!HERE(FOOD))
return GO_UNKNOWN;
case INTRANSITIVE:
if (!HERE(FOOD))
return GO_UNKNOWN;
+ /* FALLTHRU */
case FOOD:
DESTROY(FOOD);
rspeak(THANKS_DELICIOUS);
case FOOD:
DESTROY(FOOD);
rspeak(THANKS_DELICIOUS);
@@
-1006,12
+1001,12
@@
static int lock(verb_t verb, obj_t obj)
case OYSTER:
if (verb == LOCK)
rspeak(HUH_MAN);
case OYSTER:
if (verb == LOCK)
rspeak(HUH_MAN);
- else if (TOTING(OYSTER))
- rspeak(DROP_OYSTER);
+
else if (TOTING(OYSTER))
+
rspeak(DROP_OYSTER);
else if (!TOTING(TRIDENT))
rspeak(OYSTER_OPENER);
else if (!TOTING(TRIDENT))
rspeak(OYSTER_OPENER);
- else
- rspeak(OYSTER_OPENS);
+
else
+
rspeak(OYSTER_OPENS);
break;
case DOOR:
rspeak((game.prop[DOOR] == DOOR_UNRUSTED) ? OK_MAN : RUSTY_DOOR);
break;
case DOOR:
rspeak((game.prop[DOOR] == DOOR_UNRUSTED) ? OK_MAN : RUSTY_DOOR);
@@
-1148,17
+1143,11
@@
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
(or WD1 if no WD2 (SAY WHAT?, etc.).)
Magic words override. */
+/* Say. Echo WD2
.
Magic words override. */
{
{
- if (command->wd2 > 0) {
- command->wd1 = command->wd2;
- strncpy(command->raw1, command->raw2, LINESIZE - 1);
- }
- char word1[TOKLEN + 1];
- packed_to_token(command->wd1, word1);
long wd;
enum wordtype type;
long wd;
enum wordtype type;
- get_vocab_metadata(
word1
, &wd, &type);
+ get_vocab_metadata(
command->raw2
, &wd, &type);
if (wd == XYZZY ||
wd == PLUGH ||
wd == PLOVER ||
if (wd == XYZZY ||
wd == PLUGH ||
wd == PLOVER ||
@@
-1168,11
+1157,9
@@
static int say(struct command_t *command)
wd == FOO ||
wd == FUM ||
wd == PART) {
wd == FOO ||
wd == FUM ||
wd == PART) {
- /* FIXME: scribbles on the interpreter's command block */
- wordclear(&command->wd2);
- return GO_LOOKUP;
+ return GO_WORD2;
}
}
- sspeak(OKEY_DOKEY, command->raw
1
);
+ sspeak(OKEY_DOKEY, command->raw
2
);
return GO_CLEAROBJ;
}
return GO_CLEAROBJ;
}
@@
-1322,14
+1309,14
@@
int action(struct command_t *command)
if (game.loc == LOC_START ||
game.loc == LOC_VALLEY ||
game.loc == LOC_SLIT) {
if (game.loc == LOC_START ||
game.loc == LOC_VALLEY ||
game.loc == LOC_SLIT) {
- command->obj = D
PRSS
N;
+ command->obj = D
EPRESSIO
N;
}
if (game.loc == LOC_COBBLE ||
game.loc == LOC_DEBRIS ||
game.loc == LOC_AWKWARD ||
game.loc == LOC_BIRD ||
game.loc == LOC_PITTOP) {
}
if (game.loc == LOC_COBBLE ||
game.loc == LOC_DEBRIS ||
game.loc == LOC_AWKWARD ||
game.loc == LOC_BIRD ||
game.loc == LOC_PITTOP) {
- command->obj = ENTR
NC
;
+ command->obj = ENTR
ANCE
;
}
} else if (command->obj == DWARF && atdwrf(game.loc) > 0)
/* FALL THROUGH */;
}
} else if (command->obj == DWARF && atdwrf(game.loc) > 0)
/* FALL THROUGH */;
@@
-1350,14
+1337,14
@@
int action(struct command_t *command)
command->obj = ROD2;
/* FALL THROUGH */;
} else if ((command->verb == FIND ||
command->obj = ROD2;
/* FALL THROUGH */;
} else if ((command->verb == FIND ||
- command->verb == INVENTORY) &&
command->wd2 <= 0
)
+ command->verb == INVENTORY) &&
(command->id2 == WORD_EMPTY || command->id2 == WORD_NOT_FOUND)
)
/* FALL THROUGH */;
else {
sspeak(NO_SEE, command->raw1);
return GO_CLEAROBJ;
}
/* FALL THROUGH */;
else {
sspeak(NO_SEE, command->raw1);
return GO_CLEAROBJ;
}
- if (command->
wd2 > 0
)
+ if (command->
id2 != WORD_EMPTY && command->id2 != WORD_NOT_FOUND
)
return GO_WORD2;
if (command->verb != 0)
command->part = transitive;
return GO_WORD2;
if (command->verb != 0)
command->part = transitive;
@@
-1365,10
+1352,13
@@
int action(struct command_t *command)
switch (command->part) {
case intransitive:
switch (command->part) {
case intransitive:
- if (command->
wd2 > 0
&& command->verb != SAY)
+ if (command->
raw2[0] != '\0'
&& command->verb != SAY)
return GO_WORD2;
if (command->verb == SAY)
return GO_WORD2;
if (command->verb == SAY)
- command->obj = command->wd2;
+ /* KEYS is not special, anything not NO_OBJECT or INTRANSITIVE
+ * will do here. We're preventing interpretation as an intransitive
+ * verb when the word is unknown. */
+ command->obj = command->raw2[0] != '\0' ? KEYS : NO_OBJECT;
if (command->obj == NO_OBJECT ||
command->obj == INTRANSITIVE) {
/* Analyse an intransitive verb (ie, no object given yet). */
if (command->obj == NO_OBJECT ||
command->obj == INTRANSITIVE) {
/* Analyse an intransitive verb (ie, no object given yet). */
@@
-1453,7
+1443,7
@@
int action(struct command_t *command)
return listen();
case PART:
return reservoir();
return listen();
case PART:
return reservoir();
- default:
+ default:
// LCOV_EXCL_LINE
BUG(INTRANSITIVE_ACTION_VERB_EXCEEDS_GOTO_LIST); // LCOV_EXCL_LINE
}
}
BUG(INTRANSITIVE_ACTION_VERB_EXCEEDS_GOTO_LIST); // LCOV_EXCL_LINE
}
}
@@
-1554,14
+1544,14
@@
int action(struct command_t *command)
}
case PART:
return reservoir();
}
case PART:
return reservoir();
- default:
+ default:
// LCOV_EXCL_LINE
BUG(TRANSITIVE_ACTION_VERB_EXCEEDS_GOTO_LIST); // LCOV_EXCL_LINE
}
case unknown:
/* Unknown verb, couldn't deduce object - might need hint */
sspeak(WHAT_DO, command->raw1);
return GO_CHECKHINT;
BUG(TRANSITIVE_ACTION_VERB_EXCEEDS_GOTO_LIST); // LCOV_EXCL_LINE
}
case unknown:
/* Unknown verb, couldn't deduce object - might need hint */
sspeak(WHAT_DO, command->raw1);
return GO_CHECKHINT;
- default:
+ 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
}
}