X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=src%2Fplanets.c;h=df9efcc3126c36f6919900f1cd34bb59ed825639;hb=3cabc30da8bc015a1c66c63ee7d5250a4b15ea47;hp=a34b1f694b06b0c68a4f2faf5de49fc2875524d7;hpb=f5a89916bc70a66b6fa6a3abc4c36023503cd380;p=super-star-trek.git diff --git a/src/planets.c b/src/planets.c index a34b1f6..df9efcc 100644 --- a/src/planets.c +++ b/src/planets.c @@ -23,7 +23,7 @@ void preport(void) skip(1); for (i = 0; i < game.inplan; i++) { if ((game.state.plnets[i].known != unknown - && game.state.plnets[i].crystals != absent) + && game.state.plnets[i].inhabited == UNINHABITED) || (idebug && game.state.plnets[i].w.x !=0) ) { iknow = true; @@ -55,7 +55,7 @@ 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); @@ -386,7 +386,7 @@ void shuttle(void) game.state.plnets[game.iplnet].known = shuttle_down; game.landed = true; game.icraft = false; - prout(_("Trip complete")); + prout(_("Trip complete.")); return; } }