skip(1);
for (i = 0; i < game.inplan; i++) {
if ((game.state.plnets[i].known != unknown
- && game.state.plnets[i].crystals != 0)
+ && game.state.plnets[i].inhabited == UNINHABITED)
|| (idebug && game.state.plnets[i].w.x !=0)
) {
iknow = true;
proutn(_(" class "));
proutn(classes[game.state.plnets[i].pclass]);
proutn(" ");
- if (game.state.plnets[i].crystals <= 0) proutn(_("no "));
+ if (game.state.plnets[i].crystals != present)
+ proutn(_("no "));
prout(_("dilithium crystals present."));
if (game.state.plnets[i].known==shuttle_down)
prout(_(" Shuttle Craft Galileo on surface."));
}
}
- if (!iknow) prout(_("No information available."));
+ if (!iknow)
+ prout(_("No information available."));
}
void orbit(void)
prout(_("Both warp and impulse engines damaged."));
return;
}
- if (game.plnet.x == 0 || abs(game.sector.x-game.plnet.x) > 1 || abs(game.sector.y-game.plnet.y) > 1) {
+ if (!is_valid(game.plnet) || abs(game.sector.x-game.plnet.x) > 1 || abs(game.sector.y-game.plnet.y) > 1) {
crmshp();
prout(_(" not adjacent to planet."));
skip(1);
game.optime = 0.02+0.03*Rand();
prout(_("Helmsman Sulu- \"Entering standard orbit, Sir.\""));
newcnd();
- if (consumeTime()) return;
+ if (consumeTime())
+ return;
game.height = (1400.0+7200.0*Rand());
prout(_("Sulu- \"Entered orbit at altitude %.2f kilometers.\""), game.height);
game.inorbit = true;
if (game.state.plnets[game.iplnet].known==shuttle_down)
prout(_(" Sensors show Galileo still on surface."));
proutn(_(" Readings indicate"));
- if (game.state.plnets[game.iplnet].crystals == 0) proutn(_(" no"));
+ if (game.state.plnets[game.iplnet].crystals != present)
+ proutn(_(" no"));
prout(_(" dilithium crystals present.\""));
- if (game.state.plnets[game.iplnet].known == unknown) game.state.plnets[game.iplnet].known = known;
+ if (game.state.plnets[game.iplnet].known == unknown)
+ game.state.plnets[game.iplnet].known = known;
}
}
if (!damaged(DSHUTTL) && (game.state.plnets[game.iplnet].known==shuttle_down || game.iscraft == onship)) {
skip(1);
proutn(_("Spock- \"May I suggest the shuttle craft, Sir?\" "));
- if (ja() == true) shuttle();
+ if (ja() == true)
+ shuttle();
}
return;
}
}
else {
/* Going to planet */
- if (game.state.plnets[game.iplnet].crystals==0) {
+ if (game.state.plnets[game.iplnet].crystals==absent) {
prout(_("Spock- \"Captain, I fail to see the logic in"));
prout(_(" exploring a planet with no dilithium crystals."));
proutn(_(" Are you sure this is wise?\" "));
prout(_("Mining party not on planet."));
return;
}
- if (game.state.plnets[game.iplnet].crystals == MINED) {
+ if (game.state.plnets[game.iplnet].crystals == mined) {
prout(_("This planet has already been strip-mined for dilithium."));
return;
}
- else if (game.state.plnets[game.iplnet].crystals == 0) {
+ else if (game.state.plnets[game.iplnet].crystals == absent) {
prout(_("No dilithium crystals on this planet."));
return;
}
return;
}
game.optime = (0.1+0.2*Rand())*game.state.plnets[game.iplnet].pclass;
- if (consumeTime()) return;
+ if (consumeTime())
+ return;
prout(_("Mining operation complete."));
- game.state.plnets[game.iplnet].crystals = MINED;
+ game.state.plnets[game.iplnet].crystals = mined;
game.imine = game.ididit = true;
}
prout(_(" boards Galileo and swoops toward planet surface."));
game.iscraft = offship;
skip(1);
- if (consumeTime()) return;
+ if (consumeTime())
+ return;
game.state.plnets[game.iplnet].known=shuttle_down;
prout(_("Trip complete."));
return;
game.icraft = true;
skip(1);
game.landed = false;
- if (consumeTime()) return;
+ if (consumeTime())
+ return;
game.iscraft = onship;
game.icraft = false;
if (game.imine) {
skip(1);
game.icraft = true;
game.iscraft = offship;
- if (consumeTime()) return;
+ if (consumeTime())
+ return;
game.state.plnets[game.iplnet].known = shuttle_down;
game.landed = true;
game.icraft = false;
- prout(_("Trip complete"));
+ prout(_("Trip complete."));
return;
}
}
prout(_("Spock- \"Captain, the 'Experimental Death Ray'"));
prout(_(" is highly unpredictible. Considering the alternatives,"));
proutn(_(" are you sure this is wise?\" "));
- if (ja() == false) return;
+ if (ja() == false)
+ return;
prout(_("Spock- \"Acknowledged.\""));
skip(1);
game.ididit = true;
while (game.nenhere > 0)
deadkl(game.ks[1], game.quad[game.ks[1].x][game.ks[1].y],game.ks[1]);
prout(_("Ensign Chekov- \"Congratulations, Captain!\""));
- if (KLINGREM == 0) finish(FWON);
+ if (KLINGREM == 0)
+ finish(FWON);
if ((game.options & OPTION_PLAIN) == 0) {
prout(_("Spock- \"Captain, I believe the `Experimental Death Ray'"));
if (Rand() <= 0.05) {
prout(_(" Mr. Sulu."));
for_sectors(i)
for_sectors(j)
- if (game.quad[i][j] == IHDOT) game.quad[i][j] = IHQUEST;
+ if (game.quad[i][j] == IHDOT)
+ game.quad[i][j] = IHQUEST;
prout(_(" Captain, our quadrant is now infested with"));
prouts(_(" - - - - - - *THINGS*."));
skip(1);