archives/open-adventure
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Refactor main command loop to eliminate L2000.

Browse source
This commit is contained in:
Eric S. Raymond 2017-06-12 09:42:43 -04:00
parent 1c4097314a
commit d85ef403af
1 changed files with 171 additions and 172 deletions
Download patch file Download diff file Expand all files Collapse all files

17
main.c
View file

@ -712,7 +712,6 @@ static bool closecheck(void)
if (game.tally == 0 && INDEEP(game.loc) && game.loc != 33) if (game.tally == 0 && INDEEP(game.loc) && game.loc != 33)
--game.clock1; --game.clock1;
/* When the first warning comes, we lock the grate, destroy /* When the first warning comes, we lock the grate, destroy
* the bridge, kill all the dwarves (and the pirate), remove * the bridge, kill all the dwarves (and the pirate), remove
* the troll and bear (unless dead), and set "closng" to * the troll and bear (unless dead), and set "closng" to
@ -888,6 +887,7 @@ static void listobjects(void)
} }
static bool do_command(FILE *cmdin) static bool do_command(FILE *cmdin)
/* Get and execute a command */
{ {
long KQ, VERB, KK, V1, V2; long KQ, VERB, KK, V1, V2;
long i, k, KMOD; long i, k, KMOD;
@ -923,9 +923,7 @@ static bool do_command(FILE *cmdin)
/* Describe the current location and (maybe) get next command. */ /* Describe the current location and (maybe) get next command. */
/* Print text for current loc. */ for (;;) {
L2000:
if (game.loc == 0) if (game.loc == 0)
croak(cmdin); croak(cmdin);
char* msg = short_location_descriptions[game.loc]; char* msg = short_location_descriptions[game.loc];
@ -938,7 +936,7 @@ L2000:
RSPEAK(23); RSPEAK(23);
game.oldlc2 = game.loc; game.oldlc2 = game.loc;
croak(cmdin); croak(cmdin);
goto L2000; continue; /* back to top of main interpreter loop */
} }
msg=arbitrary_messages[16]; msg=arbitrary_messages[16];
} }
@ -948,7 +946,7 @@ L2000:
if (playermove(cmdin, VERB, 1)) if (playermove(cmdin, VERB, 1))
return true; return true;
else else
goto L2000; continue; /* back to top of main interpreter loop */
} }
if (game.loc == 33 && PCT(25) && !game.closng)RSPEAK(7); if (game.loc == 33 && PCT(25) && !game.closng)RSPEAK(7);
@ -1061,7 +1059,7 @@ L2630:
if (playermove(cmdin, VERB, KMOD)) if (playermove(cmdin, VERB, KMOD))
return true; return true;
else else
goto L2000; continue; /* back to top of main interpreter loop */
case 1: part=unknown; obj = KMOD; break; case 1: part=unknown; obj = KMOD; break;
case 2: part=intransitive; VERB = KMOD; break; case 2: part=intransitive; VERB = KMOD; break;
case 3: RSPEAK(KMOD); goto L2012; case 3: RSPEAK(KMOD); goto L2012;
@ -1075,7 +1073,7 @@ Laction:
case 8: case 8:
playermove(cmdin, VERB, NUL); playermove(cmdin, VERB, NUL);
return true; return true;
case 2000: goto L2000; case 2000: continue; /* back to top of main interpreter loop */
case 2012: goto L2012; case 2012: goto L2012;
case 2600: goto L2600; case 2600: goto L2600;
case 2607: goto L2607; case 2607: goto L2607;
@ -1102,5 +1100,6 @@ Laction:
BUG(99); BUG(99);
} }
} }
}
/* EMD */ /* end */