X-Git-Url: https://jxself.org/git/?p=super-star-trek.git;a=blobdiff_plain;f=planets.c;h=7dd95415b29cfb945fcd2f8bdff13791e5816e30;hp=5ea7479ec97ca992c662ba888b25533cb4c99ba2;hb=c5b4cba0782b02223a1064273a782b845ce089aa;hpb=8629b4a298e31f81ba0db0debb4796356c3966c7 diff --git a/planets.c b/planets.c index 5ea7479..7dd9541 100644 --- a/planets.c +++ b/planets.c @@ -17,7 +17,7 @@ static int consumeTime(void) } #endif // asave = future[FSNOVA]; -// future[FSNOVA] = 1e30; /* defer supernovas */ +// future[FSNOVA] = FOREVER; /* defer supernovas */ 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*/ @@ -69,7 +69,8 @@ void orbit(void) } if (plnetx == 0 || abs(sectx-plnetx) > 1 || abs(secty-plnety) > 1) { crmshp(); - prout(" not adjacent to planet.\n"); + prout(" not adjacent to planet."); + skip(1); return; } Time = 0.02+0.03*Rand(); @@ -435,7 +436,7 @@ void deathray(void) while (nenhere > 0) deadkl(game.kx[1],game.ky[1],game.quad[game.kx[1]][game.ky[1]],game.kx[1],game.ky[1]); prout("Ensign Chekov- \"Congratulations, Captain!\""); - if (game.state.remkl == 0) finish(FWON); + if (KLINGREM == 0) finish(FWON); prout("Spock- \"Captain, I believe the `Experimental Death Ray'"); if (Rand() <= 0.05) { prout(" is still operational.\"");