projects
/
open-adventure.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove special-case code that was inducing bugs.
[open-adventure.git]
/
actions.c
diff --git
a/actions.c
b/actions.c
index 54cd4e0b2d0573d3983ba06e26af20ee93d07e85..209d257658ba3766d463487234a4ee28a4e8df47 100644
(file)
--- a/
actions.c
+++ b/
actions.c
@@
-265,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);
}
@@
-591,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);
@@
-1143,15
+1145,11
@@
static int rub(verb_t verb, obj_t obj)
static int say(struct command_t *command)
/* Say. Echo WD2 (or WD1 if no WD2 (SAY WHAT?, etc.).) Magic words override. */
{
static int say(struct command_t *command)
/* Say. Echo WD2 (or WD1 if no WD2 (SAY WHAT?, etc.).) 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);
+ char word2[TOKLEN + 1];
+ packed_to_token(command->wd2, word2);
long wd;
enum wordtype type;
long wd;
enum wordtype type;
- get_vocab_metadata(word
1
, &wd, &type);
+ get_vocab_metadata(word
2
, &wd, &type);
if (wd == XYZZY ||
wd == PLUGH ||
wd == PLOVER ||
if (wd == XYZZY ||
wd == PLUGH ||
wd == PLOVER ||
@@
-1161,11
+1159,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;
}
@@
-1315,14
+1311,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 */;
@@
-1358,7
+1354,7
@@
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)
command->obj = command->wd2;
return GO_WORD2;
if (command->verb == SAY)
command->obj = command->wd2;