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

Label and global-variable elimination.

Browse source
This commit is contained in:
Eric S. Raymond 2017-06-09 12:04:45 -04:00
parent 64897f132e
commit 733312bdc7
1 changed files with 12 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

17
main.c
View file

@ -68,7 +68,7 @@ int main(int argc, char *argv[])
while ((ch = getopt(argc, argv, "l:o")) != EOF) { while ((ch = getopt(argc, argv, "l:o")) != EOF) {
switch (ch) { switch (ch) {
case 'l': case 'l':
logfp = fopen(optarg, "w"); logfp = fopen(optarg, "w");
if (logfp == NULL) if (logfp == NULL)
fprintf(stderr, fprintf(stderr,
@ -292,6 +292,7 @@ static bool dwarfmove(void)
attack=0; attack=0;
stick=0; stick=0;
for (int i=1; i<=NDWARVES; i++) { for (int i=1; i<=NDWARVES; i++) {
int k;
if(game.dloc[i] == 0) if(game.dloc[i] == 0)
continue; continue;
/* Fill TK array with all the places this dwarf might go. */ /* Fill TK array with all the places this dwarf might go. */
@ -334,21 +335,23 @@ static bool dwarfmove(void)
* (game.prop=0). */ * (game.prop=0). */
if(game.loc == game.chloc || game.prop[CHEST] >= 0) if(game.loc == game.chloc || game.prop[CHEST] >= 0)
continue; continue;
K=0; k=0;
for (int j=MINTRS; j<=MAXTRS; j++) { for (int j=MINTRS; j<=MAXTRS; j++) {
/* Pirate won't take pyramid from plover room or dark /* Pirate won't take pyramid from plover room or dark
* room (too easy!). */ * room (too easy!). */
if(j == PYRAM && (game.loc == PLAC[PYRAM] || game.loc == PLAC[EMRALD])) if(j == PYRAM && (game.loc == PLAC[PYRAM] || game.loc == PLAC[EMRALD])) {
goto L6020; if(HERE(j))
k=1;
continue;
}
if(TOTING(j)) { if(TOTING(j)) {
goto L6021; goto L6021;
} }
L6020:
if(HERE(j)) if(HERE(j))
K=1; k=1;
} }
/* Force chest placement before player finds last treasure */ /* Force chest placement before player finds last treasure */
if(game.tally == 1 && K == 0 && game.place[CHEST] == 0 && HERE(LAMP) && game.prop[LAMP] == 1) { if(game.tally == 1 && k == 0 && game.place[CHEST] == 0 && HERE(LAMP) && game.prop[LAMP] == 1) {
RSPEAK(186); RSPEAK(186);
MOVE(CHEST,game.chloc); MOVE(CHEST,game.chloc);
MOVE(MESSAG,game.chloc2); MOVE(MESSAG,game.chloc2);