projects
/
open-adventure.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Last remnants of packing removed.
[open-adventure.git]
/
actions.c
diff --git
a/actions.c
b/actions.c
index 83177d4ad666cdec551f77021c5792811bda8098..4fd0dda52652fe7941e58390779a5eaf407e4960 100644
(file)
--- a/
actions.c
+++ b/
actions.c
@@
-930,8
+930,7
@@
static int listen(void)
* depending on whether player has drunk dragon's blood. */
if (i == BIRD)
mi += 3 * game.blooded;
* depending on whether player has drunk dragon's blood. */
if (i == BIRD)
mi += 3 * game.blooded;
- long packed_zzword = token_to_packed(game.zzword);
- pspeak(i, hear, mi, true, packed_zzword);
+ pspeak(i, hear, mi, true, game.zzword);
rspeak(NO_MESSAGE);
if (i == BIRD && mi == BIRD_ENDSTATE)
DESTROY(BIRD);
rspeak(NO_MESSAGE);
if (i == BIRD && mi == BIRD_ENDSTATE)
DESTROY(BIRD);
@@
-1143,17
+1142,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->raw2 != '\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 ||
@@
-1163,11
+1156,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;
}
@@
-1363,7
+1354,10
@@
int action(struct command_t *command)
if (command->raw2[0] != '\0' && command->verb != SAY)
return GO_WORD2;
if (command->verb == SAY)
if (command->raw2[0] != '\0' && 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). */