X-Git-Url: https://jxself.org/git/?p=super-star-trek.git;a=blobdiff_plain;f=planets.c;h=057fb84dbd1cd3bdd0af04efb5c707e12dda6ef4;hp=aaffdd4fe4a8835032ff63cee8e2d08164cf5c06;hb=e536fe754b3a9be00dcaee8f6ec50ea2d8c7a184;hpb=8b0a1880ee115e281afe83e1cd0c90e3306dfed8 diff --git a/planets.c b/planets.c index aaffdd4..057fb84 100644 --- a/planets.c +++ b/planets.c @@ -23,7 +23,7 @@ static int consumeTime(void) events(); /* Used to avoid if future[FSCMOVE] within time */ // future[FSNOVA] = asave; /*fails if game over, quadrant super-novas or we've moved to new quadrant*/ - if (alldone || game.state.galaxy[quadx][quady] == SUPERNOVA_PLACE || justin != 0) return 1; + if (alldone || game.state.galaxy[quadx][quady].supernova || justin != 0) return 1; return 0; } @@ -84,7 +84,7 @@ void orbit(void) ididit=1; } -void sensor(void) +void sensor(int force) { skip(1); chew(); @@ -92,11 +92,11 @@ void sensor(void) prout("Short range sensors damaged."); return; } - if (plnetx == 0) { + if (!plnetx && ((game.state.plnets[iplnet].known == unknown || force))) { prout("Spock- \"No planet in this quadrant, Captain.\""); return; } - if ((plnetx != 0)&&(game.state.plnets[iplnet].known == 0)) { + if ((plnetx != 0)&&(game.state.plnets[iplnet].known == unknown)) { prout("Spock- \"Sensor scan for %s-", cramlc(quadrant, quadx, quady)); skip(1); prout(" Planet at %s is of class %s.", @@ -469,7 +469,7 @@ void deathray(void) skip(1); prout("Lt. Uhura- \"Graaeek! Graaeek!\""); skip(1); - prout("Spock- \"Facinating! . . . All humans aboard"); + prout("Spock- \"Fascinating! . . . All humans aboard"); prout(" have apparently been transformed into strange mutations."); prout(" Vulcans do not seem to be affected."); skip(1);