projects
/
open-adventure.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Magic number elimination, repair some careless replace damage.
[open-adventure.git]
/
actions.c
diff --git
a/actions.c
b/actions.c
index 74d67566af2619ed2f1a169fbdc8a88e4218cfc9..e90cf195feb89efb3d5bf0620169b41263b5f95f 100644
(file)
--- a/
actions.c
+++ b/
actions.c
@@
-578,7
+578,7
@@
static int find(token_t verb, token_t obj)
obj == LIQLOC(game.loc) ||
(obj == DWARF && ATDWRF(game.loc) > 0))
spk = YOU_HAVEIT;
obj == LIQLOC(game.loc) ||
(obj == DWARF && ATDWRF(game.loc) > 0))
spk = YOU_HAVEIT;
- if (game.closed)spk = NEEDED_NE
replace
;
+ if (game.closed)spk = NEEDED_NE
ARBY
;
if (TOTING(obj))spk = ALREADY_CARRYING;
RSPEAK(spk);
return GO_CLEAROBJ;
if (TOTING(obj))spk = ALREADY_CARRYING;
RSPEAK(spk);
return GO_CLEAROBJ;
@@
-792,7
+792,7
@@
static int pour(token_t verb, token_t obj)
static int quit(void)
/* Quit. Intransitive only. Verify intent and exit if that's what he wants. */
{
static int quit(void)
/* Quit. Intransitive only. Verify intent and exit if that's what he wants. */
{
- if (YES(
REALLY_QUIT, OK_MAN, OK_MAN
))
+ if (YES(
arbitrary_messages[REALLY_QUIT], arbitrary_messages[OK_MAN], arbitrary_messages[OK_MAN]
))
terminate(quitgame);
return GO_CLEAROBJ;
}
terminate(quitgame);
return GO_CLEAROBJ;
}
@@
-820,7
+820,7
@@
static int read(token_t verb, token_t obj)
return GO_CLEAROBJ;
}
if (obj == OYSTER && !game.clshnt) {
return GO_CLEAROBJ;
}
if (obj == OYSTER && !game.clshnt) {
- game.clshnt = YES(
CLUE_QUERY, WAYOUT_CLUE, OK_MAN
);
+ game.clshnt = YES(
arbitrary_messages[CLUE_QUERY], arbitrary_messages[WAYOUT_CLUE], arbitrary_messages[OK_MAN]
);
return GO_CLEAROBJ;
}
PSPEAK(obj, OBJTXT[obj] + game.prop[obj]);
return GO_CLEAROBJ;
}
PSPEAK(obj, OBJTXT[obj] + game.prop[obj]);