projects
/
open-adventure.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
a76cbec
)
Clean up missed actspk[] references.
author
Jason S. Ninneman
<jsn@mbar.us>
Tue, 27 Jun 2017 05:03:42 +0000
(22:03 -0700)
committer
Jason S. Ninneman
<jsn@mbar.us>
Tue, 27 Jun 2017 05:03:42 +0000
(22:03 -0700)
actions.c
patch
|
blob
|
history
diff --git
a/actions.c
b/actions.c
index ffb52f6036e41661f639f35da14816a99bed7515..5bb95553bc21937c348c5088ef32e143dca58558 100644
(file)
--- a/
actions.c
+++ b/
actions.c
@@
-816,7
+816,7
@@
static int read(struct command_t command)
} else if (command.obj == OYSTER && !game.clshnt && game.closed) {
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) {
} else if (command.obj == OYSTER && !game.clshnt && game.closed) {
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(act
spk[command.verb]
);
+ rspeak(act
ions[command.verb].message
);
} else
pspeak(command.obj, study, game.prop[command.obj]);
return GO_CLEAROBJ;
} else
pspeak(command.obj, study, game.prop[command.obj]);
return GO_CLEAROBJ;
@@
-893,7
+893,7
@@
static int throw (FILE *cmdin, struct command_t *command)
* (Only way to do so!) Axe also special for dragon, bear, and
* troll. Treasures special for troll. */
{
* (Only way to do so!) Axe also special for dragon, bear, and
* troll. Treasures special for troll. */
{
- int spk = act
spk[command->verb]
;
+ int spk = act
ions[command->verb].message
;
if (TOTING(ROD2) && command->obj == ROD && !TOTING(ROD))command->obj = ROD2;
if (!TOTING(command->obj)) {
rspeak(spk);
if (TOTING(ROD2) && command->obj == ROD && !TOTING(ROD))command->obj = ROD2;
if (!TOTING(command->obj)) {
rspeak(spk);
@@
-1005,7
+1005,7
@@
int action(FILE *input, struct command_t *command)
* unless verb is "say", which snarfs arbitrary second word.
*/
{
* unless verb is "say", which snarfs arbitrary second word.
*/
{
- token_t spk = act
spk[command->verb]
;
+ token_t spk = act
ions[command->verb].message
;
if (command->part == unknown) {
/* Analyse an object word. See if the thing is here, whether
if (command->part == unknown) {
/* Analyse an object word. See if the thing is here, whether