One more goto gone.

This commit is contained in:
Eric S. Raymond 2017-06-08 08:26:10 -04:00
parent ecc6caab4e
commit e7576855df

7
main.c
View file

@ -346,11 +346,15 @@ static bool dwarfmove(void)
if(HERE(J)) if(HERE(J))
K=1; K=1;
} }
/* 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);
goto L6024; game.dloc[PIRATE]=game.chloc;
game.odloc[PIRATE]=game.chloc;
game.dseen[PIRATE]=false;
continue;
} }
if(game.odloc[PIRATE] != game.dloc[PIRATE] && PCT(20)) if(game.odloc[PIRATE] != game.dloc[PIRATE] && PCT(20))
RSPEAK(127); RSPEAK(127);
@ -372,7 +376,6 @@ static bool dwarfmove(void)
DROP(J,game.chloc); DROP(J,game.chloc);
} }
} }
L6024:
game.dloc[PIRATE]=game.chloc; game.dloc[PIRATE]=game.chloc;
game.odloc[PIRATE]=game.chloc; game.odloc[PIRATE]=game.chloc;
game.dseen[PIRATE]=false; game.dseen[PIRATE]=false;