for (l = 1; l <= n; l++) {
ix = (x += deltax) + 0.5;
iy = (y += deltay) + 0.5;
- if (ix < 1 || ix > QUADSIZE || iy < 1 || iy > QUADSIZE) {
+ if (!VALID_SECTOR(ix, iy)) {
/* Leaving quadrant -- allow final enemy attack */
/* Don't do it if being pushed by Nova */
if (nenhere != 0 && iattak != 2) {
* that attacks only happen if Klingons
* are present and your skill is good.
*/
- if (skill > SKILL_GOOD && klhere > 0 && game.state.galaxy[quadx][quady] != SUPERNOVA_PLACE)
+ if (skill > SKILL_GOOD && klhere > 0 && !game.state.galaxy[quadx][quady].supernova)
attack(0);
if (alldone) return;
}
game.kdist[l] = finald;
}
sortkl();
- if (game.state.galaxy[quadx][quady] != SUPERNOVA_PLACE && iattak == 0)
+ if (!game.state.galaxy[quadx][quady].supernova && iattak == 0)
attack(0);
for (l = 1 ; l <= nenhere; l++) game.kavgd[l] = game.kdist[l];
}
if (landed == 1 && !isprobe) {
prout("Dummy! You can't leave standard orbit until you");
- proutn("are back abourt the ");
+ proutn("are back aboard the ");
crmshp();
prout(".");
chew();
}
itemp = 1;
}
- if (irowq<1 || irowq > GALSIZE || icolq<1 || icolq > GALSIZE ||
- irows<1 || irows > QUADSIZE || icols<1 || icols > QUADSIZE) {
- huh();
- return;
- }
+ if (!VALID_QUADRANT(icolq,irowq)||!VALID_SECTOR(icols,irows)) {
+ huh();
+ return;
+ }
skip(1);
if (!isprobe) {
if (itemp) {
for (l = 1; l <= n; l++) {
x += deltax;
ix = x + 0.5;
- if (ix < 1 || ix > QUADSIZE) break;
y += deltay;
iy = y +0.5;
- if (iy < 1 || iy > QUADSIZE) break;
+ if (!VALID_SECTOR(ix, iy)) break;
if (game.quad[ix][iy] != IHDOT) {
blooey = 0;
twarp = 0;
crmshp();
skip(1);
prout("safely out of quadrant.");
- game.starch[quadx][quady] = game.damage[DRADIO] > 0.0 ? game.state.galaxy[quadx][quady]+SUPERNOVA_PLACE:1;
-
+ if (game.damage[DRADIO] == 0.0)
+ game.state.galaxy[quadx][quady].charted = TRUE;
/* Try to use warp engines */
if (game.damage[DWARPEN]) {
skip(1);
finish(FSNOVAED);
return;
}
+ } while
/* Repeat if another snova */
- } while (game.state.galaxy[quadx][quady] == SUPERNOVA_PLACE);
- if (game.state.remkl==0) finish(FWON); /* Snova killed remaining enemy. */
+ (game.state.galaxy[quadx][quady].supernova);
+ if (game.state.remkl==0)
+ finish(FWON); /* Snova killed remaining enemy. */
}
void timwrp()
{
- int l, ll, gotit;
+ int l, gotit;
prout("***TIME WARP ENTERED.");
if (game.state.snap && Rand() < 0.5) {
/* Go back in time */
prout("Checkov- \"Security reports the Galileo has reappeared in the dock!\"");
iscraft = 1;
}
-
- /* Revert star chart to earlier era, if it was known then*/
- if (game.damage[DRADIO]==0.0 || stdamtim > game.state.date) {
- for (l = 1; l <= GALSIZE; l++)
- for (ll = 1; ll <= GALSIZE; ll++)
- if (game.starch[l][ll] > 1)
- game.starch[l][ll]=game.damage[DRADIO]>0.0 ? game.state.galaxy[l][ll]+SUPERNOVA_PLACE :1;
- prout("Spock has reconstructed a correct star chart from memory");
- if (game.damage[DRADIO] > 0.0) stdamtim = game.state.date;
- }
+ /*
+ * There used to be code to do the actual reconstrction here,
+ * but the starchart is now part of the snapshotted galaxy state.
+ */
+ prout("Spock has reconstructed a correct star chart from memory");
}
else {
/* Go forward in time */
for (l = 1; l <= 5; l++) {
ix = basex+3.0*Rand()-1;
iy = basey+3.0*Rand()-1;
- if (ix>=1 && ix<=QUADSIZE && iy>=1 && iy<=QUADSIZE && game.quad[ix][iy]==IHDOT) {
+ if (VALID_SECTOR(ix,iy) && game.quad[ix][iy]==IHDOT) {
/* found one -- finish up */
sectx=ix;
secty=iy;