/* If tractor beam is to occur, don't move full distance */
if (game.state.date+game.optime >= scheduled(FTBEAM)) {
trbeam = true;
- game.condit = IHRED;
+ game.condition = red;
game.dist = game.dist*(scheduled(FTBEAM)-game.state.date)/game.optime + 0.1;
game.optime = scheduled(FTBEAM) - game.state.date + 1e-5;
}
game.kavgd[m] = 0.5 * (finald + game.kdist[m]);
}
/*
- * Stas Sergeev added the game.condition
+ * Stas Sergeev added the condition
* that attacks only happen if Klingons
* are present and your skill is good.
*/
case IHR:
case IHQUEST:
game.sector = w;
- ram(0, iquad, game.sector);
+ ram(false, iquad, game.sector);
final = game.sector;
break;
case IHBLANK:
/* dock our ship at a starbase */
{
chew();
- if (game.condit == IHDOCKED && verbose) {
+ if (game.condition == docked && verbose) {
prout(_("Already docked."));
return;
}
prout(_(" not adjacent to base."));
return;
}
- game.condit = IHDOCKED;
+ game.condition = docked;
if (verbose) prout(_("Docked."));
game.ididit = true;
if (game.energy < game.inenrg) game.energy = game.inenrg;
game.lsupres = game.inlsr;
game.state.crew = FULLCREW;
if (!damaged(DRADIO) &&
- (is_scheduled(FCDBAS) || game.isatb == 1) && game.iseenit == 0) {
+ (is_scheduled(FCDBAS) || game.isatb == 1) && !game.iseenit) {
/* get attack report from base */
prout(_("Lt. Uhura- \"Captain, an important message from the starbase:\""));
attakreport(false);
- game.iseenit = 1;
+ game.iseenit = true;
}
}
void timwrp()
/* let's do the time warp again */
{
- int l, gotit;
+ int l;
+ bool gotit;
prout(_("***TIME WARP ENTERED."));
if (game.state.snap && Rand() < 0.5) {
/* Go back in time */
/* Make sure Galileo is consistant -- Snapshot may have been taken
when on planet, which would give us two Galileos! */
- gotit = 0;
+ gotit = false;
for (l = 0; l < game.inplan; l++) {
if (game.state.plnets[l].known == shuttle_down) {
- gotit = 1;
+ gotit = true;
if (game.iscraft==1 && game.ship==IHE) {
prout(_("Checkov- \"Security reports the Galileo has disappeared, Sir!"));
game.iscraft = 0;
}
/* Likewise, if in the original time the Galileo was abandoned, but
was on ship earlier, it would have vanished -- lets restore it */
- if (game.iscraft==0 && gotit==0 && game.damage[DSHUTTL] >= 0.0) {
+ if (game.iscraft==0 && !gotit && game.damage[DSHUTTL] >= 0.0) {
prout(_("Checkov- \"Security reports the Galileo has reappeared in the dock!\""));
game.iscraft = 1;
}
if (is_scheduled(FDSPROB)) {
chew();
skip(1);
- if (damaged(DRADIO) && game.condit != IHDOCKED) {
+ if (damaged(DRADIO) && game.condition != docked) {
prout(_("Spock- \"Records show the previous probe has not yet"));
prout(_(" reached its destination.\""));
}
int line = 0, m, ix, iy;
chew();
- /* Test for game.conditions which prevent calling for help */
- if (game.condit == IHDOCKED) {
+ /* Test for conditions which prevent calling for help */
+ if (game.condition == docked) {
prout(_("Lt. Uhura- \"But Captain, we're already docked.\""));
return;
}