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:
a4da530
)
Resolve a goto.
author
Eric S. Raymond
<esr@thyrsus.com>
Sat, 10 Jun 2017 23:08:58 +0000
(19:08 -0400)
committer
Eric S. Raymond
<esr@thyrsus.com>
Sun, 11 Jun 2017 01:09:14 +0000
(21:09 -0400)
main.c
patch
|
blob
|
history
diff --git
a/main.c
b/main.c
index dd29c92deac960141c75ba240d82fb7aebb52750..0e934ba81e90a12c6e68471489ce0de93913e150 100644
(file)
--- a/
main.c
+++ b/
main.c
@@
-510,27
+510,28
@@
static bool playermove(FILE *cmdin, token_t verb)
if (K == game.loc)K2=91;
if (CNDBIT(game.loc,4))K2=274;
if (K2 == 0) {
if (K == game.loc)K2=91;
if (CNDBIT(game.loc,4))K2=274;
if (K2 == 0) {
- L21:
- LL=MOD((labs(TRAVEL[KK])/1000),1000);
- if (LL != K) {
- if (LL <= 300) {
- if (FORCED(LL) && MOD((labs(TRAVEL[KEY[LL]])/1000),1000) == K)
- K2=KK;
- }
- if (TRAVEL[KK] >= 0) {
- ++KK;
- goto L21;
- }
- KK=K2;
- if (KK == 0) {
- RSPEAK(140);
- return true;
+ for (;;) {
+ LL=MOD((labs(TRAVEL[KK])/1000),1000);
+ if (LL != K) {
+ if (LL <= 300) {
+ if (FORCED(LL) && MOD((labs(TRAVEL[KEY[LL]])/1000),1000) == K)
+ K2=KK;
+ }
+ if (TRAVEL[KK] >= 0) {
+ ++KK;
+ continue;
+ }
+ KK=K2;
+ if (KK == 0) {
+ RSPEAK(140);
+ return true;
+ }
}
}
- }
- K=MOD(labs(TRAVEL[KK]),1000);
- KK=KEY[game.loc];
- goto L9;
+ K=MOD(labs(TRAVEL[KK]),1000);
+ KK=KEY[game.loc];
+ break; /* fall through to ordinary travel */
+ }
} else {
RSPEAK(K2);
return true;
} else {
RSPEAK(K2);
return true;
@@
-551,10
+552,13
@@
static bool playermove(FILE *cmdin, token_t verb)
RSPEAK((OUTSID(game.loc) && game.loc != 8) ? 57 : 58);
return true;
}
RSPEAK((OUTSID(game.loc) && game.loc != 8) ? 57 : 58);
return true;
}
- game.oldlc2=game.oldloc;
- game.oldloc=game.loc;
+ else {
+ /* none of the specials */
+ game.oldlc2=game.oldloc;
+ game.oldloc=game.loc;
+ }
-L9:
+ /* ordinary travel */
for (;;) {
LL=labs(TRAVEL[KK]);
if (MOD(LL,1000) == 1 || MOD(LL,1000) == K)
for (;;) {
LL=labs(TRAVEL[KK]);
if (MOD(LL,1000) == 1 || MOD(LL,1000) == K)