projects
/
open-adventure.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Eliminate last logic guard on a packed value.
[open-adventure.git]
/
actions.c
diff --git
a/actions.c
b/actions.c
index efa52a6bf9adecafe5db8c2ea85de6fb03c297af..5433a7dad1c0839b90e09f4b2264a66302d64784 100644
(file)
--- a/
actions.c
+++ b/
actions.c
@@
-201,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 {
@@
-266,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);
}
@@
-592,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);
@@
-1142,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 ||
@@
-1162,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;
}
@@
-1316,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 */;
@@
-1359,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). */