projects
/
open-adventure.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
733b035
)
Localized spk in discard
author
NHOrus
<jy6x2b32pie9@yahoo.com>
Tue, 4 Jul 2017 16:45:00 +0000
(19:45 +0300)
committer
NHOrus
<jy6x2b32pie9@yahoo.com>
Tue, 4 Jul 2017 16:45:00 +0000
(19:45 +0300)
actions.c
patch
|
blob
|
history
diff --git
a/actions.c
b/actions.c
index 2ad4623dce25e693b44a01157d212629b2566731..fdd1c9341e1fb911ac000fbe6241699638115dc5 100644
(file)
--- a/
actions.c
+++ b/
actions.c
@@
-447,12
+447,11
@@
static int discard(token_t verb, token_t obj, bool just_do_it)
* bird (might attack snake or dragon) and cage (might contain bird) and vase.
* Drop coins at vending machine for extra batteries. */
{
* bird (might attack snake or dragon) and cage (might contain bird) and vase.
* Drop coins at vending machine for extra batteries. */
{
- int spk = actions[verb].message;
if (!just_do_it) {
if (TOTING(ROD2) && obj == ROD && !TOTING(ROD))
obj = ROD2;
if (!TOTING(obj)) {
if (!just_do_it) {
if (TOTING(ROD2) && obj == ROD && !TOTING(ROD))
obj = ROD2;
if (!TOTING(obj)) {
- rspeak(
spk
);
+ rspeak(
actions[verb].message;
);
return GO_CLEAROBJ;
}
if (obj == BIRD && HERE(SNAKE)) {
return GO_CLEAROBJ;
}
if (obj == BIRD && HERE(SNAKE)) {
@@
-469,7
+468,7
@@
static int discard(token_t verb, token_t obj, bool just_do_it)
game.prop[CAVITY] = CAVITY_FULL;
if (HERE(RUG) && ((obj == EMERALD && game.prop[RUG] != RUG_HOVER) ||
(obj == RUBY && game.prop[RUG] == RUG_HOVER))) {
game.prop[CAVITY] = CAVITY_FULL;
if (HERE(RUG) && ((obj == EMERALD && game.prop[RUG] != RUG_HOVER) ||
(obj == RUBY && game.prop[RUG] == RUG_HOVER))) {
- spk = RUG_RISES;
+
int
spk = RUG_RISES;
if (TOTING(RUG))
spk = RUG_WIGGLES;
if (obj == RUBY)
if (TOTING(RUG))
spk = RUG_WIGGLES;
if (obj == RUBY)
@@
-515,7
+514,7
@@
static int discard(token_t verb, token_t obj, bool just_do_it)
int k = LIQUID();
if (k == obj)
obj = BOTTLE;
int k = LIQUID();
if (k == obj)
obj = BOTTLE;
- if (obj == BOTTLE && k !=
0
)
+ if (obj == BOTTLE && k !=
NO_OBJECT
)
game.place[k] = LOC_NOWHERE;
if (obj == CAGE && game.prop[BIRD] == BIRD_CAGED)
drop(BIRD, game.loc);
game.place[k] = LOC_NOWHERE;
if (obj == CAGE && game.prop[BIRD] == BIRD_CAGED)
drop(BIRD, game.loc);