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:
993194b
)
Removed spk from wave, fixed compiler warning
197/head
author
NHOrus
<jy6x2b32pie9@yahoo.com>
Sun, 2 Jul 2017 22:01:01 +0000
(
01:01
+0300)
committer
NHOrus
<jy6x2b32pie9@yahoo.com>
Sun, 2 Jul 2017 22:01:01 +0000
(
01:01
+0300)
actions.c
patch
|
blob
|
history
diff --git
a/actions.c
b/actions.c
index d9802f627143051a568c6b42302401cdbf87921e..13fc8c5dfdf7bee165612b5c0e3b5af818b84231 100644
(file)
--- a/
actions.c
+++ b/
actions.c
@@
-1089,47
+1089,40
@@
static int wake(token_t verb, token_t obj)
static token_t birdspeak(void)
{
switch (game.prop[BIRD]) {
static token_t birdspeak(void)
{
switch (game.prop[BIRD]) {
- case BIRD_UNCAGED:
- case BIRD_FOREST_UNCAGED:
- return FREE_FLY;
case BIRD_CAGED:
return CAGE_FLY;
case BIRD_CAGED:
return CAGE_FLY;
+ default:
+ return FREE_FLY;
}
}
static int wave(token_t verb, token_t obj)
/* Wave. No effect unless waving rod at fissure or at bird. */
{
}
}
static int wave(token_t verb, token_t obj)
/* Wave. No effect unless waving rod at fissure or at bird. */
{
- int spk = actions[verb].message;
- if ((!TOTING(obj)) && (obj != ROD || !TOTING(ROD2)))
- spk = ARENT_CARRYING;
if (obj != ROD ||
!TOTING(obj) ||
(!HERE(BIRD) && (game.closng || !AT(FISSURE)))) {
if (obj != ROD ||
!TOTING(obj) ||
(!HERE(BIRD) && (game.closng || !AT(FISSURE)))) {
- rspeak(
spk
);
+ rspeak(
((!TOTING(obj)) && (obj != ROD || !TOTING(ROD2))) ? ARENT_CARRYING : actions[verb].message
);
return GO_CLEAROBJ;
}
return GO_CLEAROBJ;
}
- if (HERE(BIRD))
- spk = birdspeak();
- if (spk == FREE_FLY && game.loc == game.place[STEPS] && game.prop[JADE] < 0) {
+ if (game.prop[BIRD] == BIRD_UNCAGED && game.loc == game.place[STEPS] && game.prop[JADE] < 0) {
drop(JADE, game.loc);
game.prop[JADE] = 0;
--game.tally;
drop(JADE, game.loc);
game.prop[JADE] = 0;
--game.tally;
- spk = NECKLACE_FLY;
- rspeak(spk);
+ rspeak(NECKLACE_FLY);
return GO_CLEAROBJ;
} else {
if (game.closed) {
return GO_CLEAROBJ;
} else {
if (game.closed) {
- rspeak(
spk
);
+ rspeak(
birdspeak()
);
return GO_DWARFWAKE;
}
if (game.closng || !AT(FISSURE)) {
return GO_DWARFWAKE;
}
if (game.closng || !AT(FISSURE)) {
- rspeak(
spk
);
+ rspeak(
birdspeak()
);
return GO_CLEAROBJ;
}
if (HERE(BIRD))
return GO_CLEAROBJ;
}
if (HERE(BIRD))
- rspeak(
spk
);
+ rspeak(
birdspeak()
);
/* FIXME: Arithemetic on property values */
game.prop[FISSURE] = 1 - game.prop[FISSURE];
/* FIXME: Arithemetic on property values */
game.prop[FISSURE] = 1 - game.prop[FISSURE];
@@
-1138,8
+1131,6
@@
static int wave(token_t verb, token_t obj)
}
}
}
}
-
-
int action(struct command_t *command)
/* Analyse a verb. Remember what it was, go back for object if second word
* unless verb is "say", which snarfs arbitrary second word.
int action(struct command_t *command)
/* Analyse a verb. Remember what it was, go back for object if second word
* unless verb is "say", which snarfs arbitrary second word.