- if(game.newloc > 300 || !INDEEP(game.newloc) || game.newloc == game.odloc[I] || (J > 1 && game.newloc == TK[J-1]) || J >= 20 || game.newloc == game.dloc[I] ||
- FORCED(game.newloc) || (I == 6 && CNDBIT(game.newloc,3)) ||
- labs(TRAVEL[kk])/1000000 == 100)
- goto L6014;
- TK[J]=game.newloc;
- J=J+1;
- L6014:
+ /* Have we avoided a dwarf enciounter? */
+ bool avoided = (game.newloc > 300 ||
+ !INDEEP(game.newloc) ||
+ game.newloc == game.odloc[I] ||
+ (J > 1 && game.newloc == TK[J-1]) ||
+ J >= 20 ||
+ game.newloc == game.dloc[I] ||
+ FORCED(game.newloc) ||
+ (I == 6 && CNDBIT(game.newloc,3)) ||
+ labs(TRAVEL[kk])/1000000 == 100);
+ if (!avoided) {
+ TK[J++] = game.newloc;
+ }