X-Git-Url: https://jxself.org/git/?p=super-star-trek.git;a=blobdiff_plain;f=src%2Fsetup.c;h=7b28c2d6fab57e377590ffdefa901b422a37563d;hp=ed97fd8a962765d20210a49e74ee43555f280d9f;hb=8700dc6a521fe201815aad02cf05f7f4c297c305;hpb=52265793501a00845a0d6108d1af6e50e3ece379

diff --git a/src/setup.c b/src/setup.c
index ed97fd8..7b28c2d 100644
--- a/src/setup.c
+++ b/src/setup.c
@@ -474,17 +474,17 @@ int choose(int needprompt)
     // Choose game options -- added by ESR for SST2K
     if (scan() != IHALPHA) {
 	chew();
-	proutn("Choose your game options: ");
+	proutn("Choose your game style (or just press enter): ");
 	scan();
     }
     if (isit("plain")) {
 	// Approximates the UT FORTRAN version.
-	game.options &=~ (OPTION_THOLIAN | OPTION_PLANETS | OPTION_THINGY | OPTION_PROBE | OPTION_RAMMING | OPTION_MVBADDY | OPTION_BLKHOLE | OPTION_BASE);
+	game.options &=~ (OPTION_THOLIAN | OPTION_PLANETS | OPTION_THINGY | OPTION_PROBE | OPTION_RAMMING | OPTION_MVBADDY | OPTION_BLKHOLE | OPTION_BASE | OPTION_WORLDS);
 	game.options |= OPTION_PLAIN;
     } 
     else if (isit("almy")) {
 	// Approximates Tom Almy's version.
-	game.options &=~ (OPTION_THINGY | OPTION_BLKHOLE | OPTION_BASE);
+	game.options &=~ (OPTION_THINGY | OPTION_BLKHOLE | OPTION_BASE | OPTION_WORLDS);
 	game.options |= OPTION_ALMY;
     }
     else if (isit("fancy"))
@@ -623,7 +623,10 @@ void newqad(int shutup)
     planhere = game.state.galaxy[game.quadx][game.quady].planet;
     if (planhere) {
 	game.iplnet = planhere - game.state.plnets;
-	dropin(IHP, &game.plnetx, &game.plnety);
+	if (planhere->inhabited == UNINHABITED)
+	    dropin(IHP, &game.plnetx, &game.plnety);
+	else
+	    dropin(IHW, &game.plnetx, &game.plnety);
     }
     // Check for game.condition
     newcnd();