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:
093415e
)
Abolish 18999 return from actions().
author
Eric S. Raymond
<esr@thyrsus.com>
Sun, 11 Jun 2017 15:25:31 +0000
(11:25 -0400)
committer
Eric S. Raymond
<esr@thyrsus.com>
Sun, 11 Jun 2017 15:25:31 +0000
(11:25 -0400)
actions.c
patch
|
blob
|
history
main.c
patch
|
blob
|
history
diff --git
a/actions.c
b/actions.c
index 3e811f9da226ec6d979703d4a5dbe0cc97e6e073..5d1c6a391b6d7426bec7401812ce321e0b9e81aa 100644
(file)
--- a/
actions.c
+++ b/
actions.c
@@
-180,8
+180,8
@@
static int vbreak(token_t obj)
game.fixed[VASE]= -1;
} else {
if (obj == MIRROR && game.closed) {
game.fixed[VASE]= -1;
} else {
if (obj == MIRROR && game.closed) {
-
SPK=197
;
- return(1
8999
);
+
RSPEAK(197)
;
+ return(1
90000
);
}
}
RSPEAK(SPK);
}
}
RSPEAK(SPK);
@@
-926,8
+926,8
@@
static int wake(token_t obj)
/* Wake. Only use is to disturb the dwarves. */
{
if (obj != DWARF || !game.closed) {RSPEAK(SPK); return 2012;}
/* Wake. Only use is to disturb the dwarves. */
{
if (obj != DWARF || !game.closed) {RSPEAK(SPK); return 2012;}
-
SPK=199
;
- return(1
8999
);
+
RSPEAK(199)
;
+ return(1
9000
);
}
static int wave(token_t obj)
}
static int wave(token_t obj)
@@
-949,7
+949,10
@@
static int wave(token_t obj)
RSPEAK(SPK);
return 2012;
} else {
RSPEAK(SPK);
return 2012;
} else {
- if (game.closed) return(18999);
+ if (game.closed) {
+ RSPEAK(SPK); /* FIXME: How is SPK set here? */
+ return(19000);
+ }
if (game.closng || !AT(FISSUR)) {RSPEAK(SPK); return 2012;}
if (HERE(BIRD))RSPEAK(SPK);
game.prop[FISSUR]=1-game.prop[FISSUR];
if (game.closng || !AT(FISSUR)) {RSPEAK(SPK); return 2012;}
if (HERE(BIRD))RSPEAK(SPK);
game.prop[FISSUR]=1-game.prop[FISSUR];
diff --git
a/main.c
b/main.c
index 8497ea49b1d2afe58255514df1dc54b64f14d934..760283a88bf40acc400f1f68c0e0fe5660e53d64 100644
(file)
--- a/
main.c
+++ b/
main.c
@@
-1041,14
+1041,11
@@
Laction:
RSPEAK(257);
obj=0;
goto L2600;
RSPEAK(257);
obj=0;
goto L2600;
- case 18999:
- /* Oh dear, he's disturbed the dwarves. */
- RSPEAK(SPK);
- /* fall through */
case 19000:
case 19000:
- RSPEAK(136);
- score(0);
- return true;
+ /* Oh dear, he's disturbed the dwarves. */
+ RSPEAK(136);
+ score(0);
+ return true;
}
BUG(99);
}
BUG(99);