radio_was_broken = damaged(DRADIO);
+ hold.x = hold.y = 0;
for (;;) {
/* Select earliest extraneous event, evcode==0 if no events */
evcode = FSPY;
prout(_("Lt. Uhura- \"Captain, the sub-space radio is working and"));
prout(_(" surveillance reports are coming in."));
skip(1);
- if (game.iseenit==0) {
+ if (!game.iseenit) {
attakreport(false);
- game.iseenit = 1;
+ game.iseenit = true;
}
rechart();
prout(_(" The star chart is now up to date.\""));
(game.torps < 5 || damaged(DPHOTON)))) {
/* Tractor-beam her! */
istract = true;
- yank = square(game.state.kscmdr.x-game.quadrant.x) + square(game.state.kscmdr.y-game.quadrant.y);
+ yank = distance(game.state.kscmdr, game.quadrant);
/********* fall through to FTBEAM code ***********/
}
else return;
game.quadrant = game.state.kscmdr;
else
game.quadrant = game.state.kcmdr[i];
- iran(QUADSIZE, &game.sector.x, &game.sector.y);
+ game.sector = iran(QUADSIZE);
crmshp();
proutn(_(" is pulled to "));
proutn(cramlc(quadrant, game.quadrant));
if (game.isatb) /* extra time if SC already attacking */
postpone(FCDBAS, scheduled(FSCDBAS)-game.state.date);
game.future[FBATTAK].date = game.future[FCDBAS].date + expran(0.3*game.intime);
- game.iseenit = 0;
+ game.iseenit = false;
if (!damaged(DRADIO) && game.condit != IHDOCKED)
break; /* No warning :-( */
- game.iseenit = 1;
+ game.iseenit = true;
if (!ipage) pause_game(1);
ipage = true;
skip(1);
which has some stars which are inhabited and
not already under attack, which is not
supernova'ed, and which has some Klingons in it */
- iran(GALSIZE, &w.x, &w.y);
+ w = iran(GALSIZE);
q = &game.state.galaxy[w.x][w.y];
} while (--i &&
(same(game.quadrant, w) || q->planet == NOPLANET ||
game.state.remkl++;
q->klingons++;
if (same(game.quadrant, w))
- newkling(++game.klhere, &hold);
+ newkling(++game.klhere);
/* recompute time left */
game.state.remtime = game.state.remres/(game.state.remkl+4*game.state.remcom);
kount++;
break;
case IHK: /* kill klingon */
- deadkl(scratch,iquad, scratch.x, scratch.y);
+ deadkl(scratch,iquad, scratch);
break;
case IHC: /* Damage/destroy big enemies */
case IHS:
if (same(game.ks[ll], scratch)) break;
game.kpower[ll] -= 800.0; /* If firepower is lost, die */
if (game.kpower[ll] <= 0.0) {
- deadkl(scratch, iquad, scratch.x, scratch.y);
+ deadkl(scratch, iquad, scratch);
break;
}
newc.x = scratch.x + scratch.x - hits[mm][1];
proutn(_(", blasted into "));
crmena(false, IHBLANK, sector, newc);
skip(1);
- deadkl(scratch, iquad, newc.x, newc.y);
+ deadkl(scratch, iquad, newc);
break;
}
if (iquad1 != IHDOT) {
game.quad[scratch.x][scratch.y] = IHDOT;
game.quad[newc.x][newc.y] = iquad;
game.ks[ll] = newc;
- game.kavgd[ll] = sqrt(square(game.sector.x-newc.x)+square(game.sector.y-newc.y));
- game.kdist[ll] = game.kavgd[ll];
+ game.kdist[ll] = game.kavgd[ll] = distance(game.sector, newc);
skip(1);
break;
}
prouts("***************");
skip(1);
stars();
- game.alldone=1;
+ game.alldone = true;
}
}