projects
/
open-adventure.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Location sounds are now declared by YAML.
[open-adventure.git]
/
actions.c
diff --git
a/actions.c
b/actions.c
index 6279306f723d801e20e5f494f8a27e8ace83f292..5a82a5b225b70a91c3b473984230e53f0b6902bf 100644
(file)
--- a/
actions.c
+++ b/
actions.c
@@
-112,7
+112,7
@@
static int bigwords(token_t foo)
int k = VOCAB(foo, 3);
int spk = NOTHING_HAPPENS;
if (game.foobar != 1 - k) {
int k = VOCAB(foo, 3);
int spk = NOTHING_HAPPENS;
if (game.foobar != 1 - k) {
- if (game.foobar != 0)spk = START_OVER;
+ if (game.foobar != 0
&& game.loc == LOC_GIANTROOM
)spk = START_OVER;
rspeak(spk);
return GO_CLEAROBJ;
} else {
rspeak(spk);
return GO_CLEAROBJ;
} else {
@@
-552,7
+552,7
@@
int fill(token_t verb, token_t obj)
if (LIQUID() != 0)
spk = BOTTLE_FULL;
if (spk == BOTTLED_WATER) {
if (LIQUID() != 0)
spk = BOTTLE_FULL;
if (spk == BOTTLED_WATER) {
- game.prop[BOTTLE] = MOD(
COND
[game.loc], 4) / 2 * 2;
+ game.prop[BOTTLE] = MOD(
conditions
[game.loc], 4) / 2 * 2;
k = LIQUID();
if (TOTING(BOTTLE))
game.place[k] = CARRIED;
k = LIQUID();
if (TOTING(BOTTLE))
game.place[k] = CARRIED;
@@
-671,10
+671,10
@@
static int light(token_t verb, token_t obj)
static int listen(void)
/* Listen. Intransitive only. Print stuff based on objsnd/locsnd. */
{
static int listen(void)
/* Listen. Intransitive only. Print stuff based on objsnd/locsnd. */
{
-
int
k;
+
long
k;
int spk = ALL_SILENT;
int spk = ALL_SILENT;
- k =
LOCSND[game.loc]
;
- if (k !=
0
) {
+ k =
locations[game.loc].sound
;
+ if (k !=
SILENT
) {
rspeak(labs(k));
if (k < 0) return GO_CLEAROBJ;
spk = NO_MESSAGE;
rspeak(labs(k));
if (k < 0) return GO_CLEAROBJ;
spk = NO_MESSAGE;