game.ididit = 1;
#if 0
/* Don't worry about this */
- if (future[FTBEAM] <= game.state.date+game.optime && game.state.remcom != 0 && game.condit != IHDOCKED) {
+ if (scheduled(FTBEAM) <= game.state.date+game.optime && game.state.remcom != 0 && game.condit != IHDOCKED) {
/* We are about to be tractor beamed -- operation fails */
return 1;
}
#endif
-// asave = future[FSNOVA];
-// future[FSNOVA] = FOREVER; /* defer supernovas */
- events(); /* Used to avoid if future[FSCMOVE] within time */
-// future[FSNOVA] = asave;
+// asave = scheduled(FSNOVA);
+// unschedule(FSNOVA); /* defer supernovas */
+ events(); /* Used to avoid if FSCMOVE is scheduled within time */
+// schedule(FSNOVA, asave-game.state.time);
/*fails if game over, quadrant super-novas or we've moved to new quadrant*/
- if (game.alldone || game.state.galaxy[game.quadx][game.quady].supernova || game.justin != 0) return 1;
+ if (game.alldone || game.state.galaxy[game.quadrant.x][game.quadrant.y].supernova || game.justin != 0) return 1;
return 0;
}
void preport(void)
{
- int iknow = 0, i;
+ bool iknow = false;
+ int i;
skip(1);
chew();
prout("Spock- \"Planet report follows, Captain.\"");
for (i = 0; i < game.inplan; i++) {
if ((game.state.plnets[i].known != unknown
&& game.state.plnets[i].crystals != 0)
-#ifdef DEBUG
- || ( game.idebug && game.state.plnets[i].x !=0)
-#endif
+ || (idebug && game.state.plnets[i].w.x !=0)
) {
- iknow = 1;
-#ifdef DEBUG
- if (game.idebug && game.state.plnets[i].known==unknown) proutn("(Unknown) ");
-#endif
- proutn(cramlc(quadrant, game.state.plnets[i].x, game.state.plnets[i].y));
+ iknow = true;
+ if (idebug && game.state.plnets[i].known==unknown)
+ proutn("(Unknown) ");
+ proutn(cramlc(quadrant, game.state.plnets[i].w));
proutn(" class ");
proutn(classes[game.state.plnets[i].pclass]);
proutn(" ");
{
skip(1);
chew();
- if (game.inorbit!=0) {
+ if (game.inorbit) {
prout("Already in standard orbit.");
return;
}
prout("Both warp and impulse engines damaged.");
return;
}
- if (game.plnetx == 0 || abs(game.sectx-game.plnetx) > 1 || abs(game.secty-game.plnety) > 1) {
+ if (game.plnet.x == 0 || abs(game.sector.x-game.plnet.x) > 1 || abs(game.sector.y-game.plnet.y) > 1) {
crmshp();
prout(" not adjacent to planet.");
skip(1);
if (consumeTime()) return;
game.height = (1400.0+7200.0*Rand());
prout("Sulu- \"Entered orbit at altitude %.2f kilometers.\"", game.height);
- game.inorbit = 1;
- game.ididit=1;
+ game.inorbit = true;
+ game.ididit = true;
}
void sensor(void)
prout("Short range sensors damaged.");
return;
}
- if (!game.plnetx && (game.options & OPTION_TTY)) {
+ if (!game.plnet.x && (game.options & OPTION_TTY)) {
prout("Spock- \"No planet in this quadrant, Captain.\"");
return;
}
- if ((game.plnetx != 0)&& (game.state.plnets[game.iplnet].known == unknown)) {
- prout("Spock- \"Sensor scan for %s-", cramlc(quadrant, game.quadx, game.quady));
+ if ((game.plnet.x != 0)&& (game.state.plnets[game.iplnet].known == unknown)) {
+ prout("Spock- \"Sensor scan for %s-", cramlc(quadrant, game.quadrant));
skip(1);
- prout(" Planet at %s is of class %s.",
- cramlc(sector, game.plnetx, game.plnety),
+ prout(" Planet at %s is of class %s.",
+ cramlc(sector,game.plnet),
classes[game.state.plnets[game.iplnet].pclass]);
if (game.state.plnets[game.iplnet].known==shuttle_down)
prout(" Sensors show Galileo still on surface.");
}
return;
}
- if (game.inorbit==0) {
+ if (!game.inorbit) {
crmshp();
prout(" not in standard orbit.");
return;
else prout("Shuttle craft is now serving Big Macs.");
return;
}
- if (game.inorbit==0) {
+ if (!game.inorbit) {
crmshp();
prout(" not in standard orbit.");
return;
prouts("Sulu- \"Captain! It's working!\"");
skip(2);
while (game.nenhere > 0)
- deadkl(game.kx[1],game.ky[1],game.quad[game.kx[1]][game.ky[1]],game.kx[1],game.ky[1]);
+ deadkl(game.ks[1], game.quad[game.ks[1].x][game.ks[1].y],game.ks[1].x,game.ks[1].y);
prout("Ensign Chekov- \"Congratulations, Captain!\"");
if (KLINGREM == 0) finish(FWON);
if ((game.options & OPTION_PLAIN) == 0) {
return;
}
-char *systemname(planet *planet)
+char *systemname(int pindx)
{
static char *names[NINHAB] =
{
"Exo III", /* TOS: "What Are Little Girls Made Of?" (Class P) */
};
- return names[planet->inhabited];
+ return names[pindx];
}