projects
/
open-adventure.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
More tests, multilined yaml
[open-adventure.git]
/
main.c
diff --git
a/main.c
b/main.c
index 7eb21dab571a9be8d7c381f89ddac3d67eafb91a..8dcaa52eda8e465e4e2a31817acd6ffc8e46b5d4 100644
(file)
--- a/
main.c
+++ b/
main.c
@@
-185,7
+185,7
@@
static void checkhints(void)
game.hintlc[hint] = 0;
return;
case 4: /* dark */
game.hintlc[hint] = 0;
return;
case 4: /* dark */
- if (game.prop[EMERALD] !=
NOT_YET_FOUND && game.prop[PYRAMID] == NOT_YET_
FOUND)
+ if (game.prop[EMERALD] !=
STATE_NOTFOUND && game.prop[PYRAMID] == STATE_NOT
FOUND)
break;
game.hintlc[hint] = 0;
return;
break;
game.hintlc[hint] = 0;
return;
@@
-689,7
+689,7
@@
static bool playermove( int motion)
* entries check for game.prop(TROLL)=0.) Special
* stuff for bear. */
if (game.prop[TROLL] == TROLL_PAIDONCE) {
* entries check for game.prop(TROLL)=0.) Special
* stuff for bear. */
if (game.prop[TROLL] == TROLL_PAIDONCE) {
-
pspeak(TROLL, look, TROLL_PAIDONCE
);
+
pspeak(TROLL, look, TROLL_PAIDONCE, true
);
game.prop[TROLL] = TROLL_UNPAID;
move(TROLL2, 0);
move(TROLL2 + NOBJECTS, 0);
game.prop[TROLL] = TROLL_UNPAID;
move(TROLL2, 0);
move(TROLL2 + NOBJECTS, 0);
@@
-917,7
+917,7
@@
static void listobjects(void)
int kk = game.prop[obj];
if (obj == STEPS && game.loc == game.fixed[STEPS])
kk = 1;
int kk = game.prop[obj];
if (obj == STEPS && game.loc == game.fixed[STEPS])
kk = 1;
- pspeak(obj, look, kk);
+ pspeak(obj, look, kk
, true
);
}
}
}
}
}
}
@@
-1006,7
+1006,7
@@
L2600:
* tick game.clock1 unless well into cave (and not at Y2). */
if (game.closed) {
if (game.prop[OYSTER] < 0 && TOTING(OYSTER))
* tick game.clock1 unless well into cave (and not at Y2). */
if (game.closed) {
if (game.prop[OYSTER] < 0 && TOTING(OYSTER))
-
pspeak(OYSTER, look, 1
);
+
pspeak(OYSTER, look, 1, true
);
for (size_t i = 1; i <= NOBJECTS; i++) {
if (TOTING(i) && game.prop[i] < 0)
game.prop[i] = -1 - game.prop[i];
for (size_t i = 1; i <= NOBJECTS; i++) {
if (TOTING(i) && game.prop[i] < 0)
game.prop[i] = -1 - game.prop[i];
@@
-1076,7
+1076,7
@@
L2607:
packed_to_token(command.wd2, word2);
V1 = get_vocab_id(word1);
V2 = get_vocab_id(word2);
packed_to_token(command.wd2, word2);
V1 = get_vocab_id(word1);
V2 = get_vocab_id(word2);
- if (V1 == ENTER && (V2 == STREAM || V2 ==
1000 + WATER
)) {
+ if (V1 == ENTER && (V2 == STREAM || V2 ==
PROMOTE_WORD(WATER)
)) {
if (LIQLOC(game.loc) == WATER) {
rspeak(FEET_WET);
} else {
if (LIQLOC(game.loc) == WATER) {
rspeak(FEET_WET);
} else {