projects
/
open-adventure.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix all the simple compiler warnings.
[open-adventure.git]
/
actions.c
diff --git
a/actions.c
b/actions.c
index eb7e13cc0c22d3827723cdc214953668fadddc50..9a68f268429a0f5ed1c9c615164fc1e325996850 100644
(file)
--- a/
actions.c
+++ b/
actions.c
@@
-129,17
+129,18
@@
static int bigwords(long foo)
if (game.place[EGGS]==PLAC[EGGS] || (TOTING(EGGS) && game.loc==PLAC[EGGS])) {
RSPEAK(spk);
return GO_CLEAROBJ;
if (game.place[EGGS]==PLAC[EGGS] || (TOTING(EGGS) && game.loc==PLAC[EGGS])) {
RSPEAK(spk);
return GO_CLEAROBJ;
+ } else {
+ /* Bring back troll if we steal the eggs back from him before
+ * crossing. */
+ if (game.place[EGGS]==0 && game.place[TROLL]==0 && game.prop[TROLL]==0)
+ game.prop[TROLL]=1;
+ k=2;
+ if (HERE(EGGS))k=1;
+ if (game.loc == PLAC[EGGS])k=0;
+ MOVE(EGGS,PLAC[EGGS]);
+ PSPEAK(EGGS,k);
+ return GO_CLEAROBJ;
}
}
- /* Bring back troll if we steal the eggs back from him before
- * crossing. */
- if (game.place[EGGS]==0 && game.place[TROLL]==0 && game.prop[TROLL]==0)
- game.prop[TROLL]=1;
- k=2;
- if (HERE(EGGS))k=1;
- if (game.loc == PLAC[EGGS])k=0;
- MOVE(EGGS,PLAC[EGGS]);
- PSPEAK(EGGS,k);
- return GO_CLEAROBJ;
}
}
}
}
@@
-392,13
+393,11
@@
static int drink(token_t verb, token_t obj)
return(8000);
if (obj != BLOOD) {
if (obj != 0 && obj != WATER)spk=110;
return(8000);
if (obj != BLOOD) {
if (obj != 0 && obj != WATER)spk=110;
- if (spk == 110 || LIQUID() != WATER || !HERE(BOTTLE)) {
- RSPEAK(spk);
- return GO_CLEAROBJ;
+ if (spk != 110 && LIQUID() == WATER && HERE(BOTTLE)) {
+ game.prop[BOTTLE]=1;
+ game.place[WATER]=0;
+ spk=74;
}
}
- game.prop[BOTTLE]=1;
- game.place[WATER]=0;
- spk=74;
} else {
DSTROY(BLOOD);
game.prop[DRAGON]=2;
} else {
DSTROY(BLOOD);
game.prop[DRAGON]=2;
@@
-471,7
+470,7
@@
static int feed(token_t verb, token_t obj)
return GO_CLEAROBJ;
}
else if (obj == SNAKE || obj == DRAGON || obj == TROLL) {
return GO_CLEAROBJ;
}
else if (obj == SNAKE || obj == DRAGON || obj == TROLL) {
-
int
spk=102;
+ spk=102;
if (obj == DRAGON && game.prop[DRAGON] != 0)spk=110;
if (obj == TROLL)spk=182;
if (obj == SNAKE && !game.closed && HERE(BIRD)) {
if (obj == DRAGON && game.prop[DRAGON] != 0)spk=110;
if (obj == TROLL)spk=182;
if (obj == SNAKE && !game.closed && HERE(BIRD)) {
@@
-695,7
+694,6
@@
static int listen(void)
static int lock(token_t verb, token_t obj)
/* Lock, unlock, no object given. Assume various things if present. */
{
static int lock(token_t verb, token_t obj)
/* Lock, unlock, no object given. Assume various things if present. */
{
- int k;
int spk = ACTSPK[verb];
if (obj == INTRANSITIVE) {
spk=28;
int spk = ACTSPK[verb];
if (obj == INTRANSITIVE) {
spk=28;
@@
-990,7
+988,6
@@
int action(FILE *input, enum speechpart part, long verb, token_t obj)
* unless verb is "say", which snarfs arbitrary second word.
*/
{
* unless verb is "say", which snarfs arbitrary second word.
*/
{
- int kk;
token_t spk=ACTSPK[verb];
if (part == unknown)
token_t spk=ACTSPK[verb];
if (part == unknown)