Another rollup patch.

[super-star-trek.git] / src / setup.c

diff --git a/src/setup.c b/src/setup.c
index 741f35f00016b627ab1fef2bed17e75f6d0364fd..aef792a38cfa9f07b5581940e367929327c61c52 100644 (file)
--- a/src/setup.c
+++ b/src/setup.c
@@ -212,7 +212,7 @@ void setup(bool needprompt)
     for (i=0; i < NDEVICES; i++) 
        game.damage[i] = 0.0;
     // Set up assorted game parameters
-    game.battle.x = game.battle.y = 0;
+    invalidate(game.battle);
     game.state.date = game.indate = 100.0*(int)(31.0*Rand()+20.0);
     game.nkinks = game.nhelp = game.casual = game.abandoned = 0;
     game.iscate = game.resting = game.imine = game.icrystl = game.icraft = false;
@@ -366,7 +366,7 @@ void setup(bool needprompt)
        thing = randplace(GALSIZE);
     }
     else
-       thing.x = thing.y = 0;
+       invalidate(thing);
 
     skip(2);
     game.state.snap = false;
@@ -380,13 +380,13 @@ void setup(bool needprompt)
              INKLINGTOT);
        prout(_("You have an initial allotment of %d stardates to complete"), (int)game.intime);
        prout(_("your mission.  As you proceed you may be given more time."));
-       prout("");
+       skip(1);
        prout(_("You will have %d supporting starbases."), game.inbase);
        proutn(_("Starbase locations-  "));
     }
     else {
        prout(_("Stardate %d."), (int)game.state.date);
-       prout("");
+       skip(1);
        prout(_("%d Klingons."), INKLINGTOT);
        prout(_("An unknown number of Romulans."));
        if (game.state.nscrem) prout(_("And one (GULP) Super-Commander."));
@@ -562,10 +562,10 @@ void newqad(bool shutup)
     struct quadrant *q;
 
     game.justin = true;
-    game.base.x = game.base.y = 0;
+    invalidate(game.base);
     game.klhere = 0;
     game.comhere = false;
-    game.plnet.x = game.plnet.y = 0;
+    invalidate(game.plnet);
     game.ishere = false;
     game.irhere = 0;
     game.iplnet = 0;
@@ -758,13 +758,13 @@ void sortkl(void)
 void setpassword(void)
 /* set the self-destruct password */
 {
-    if (!(game.options & OPTION_CURSES)) {
+    if (game.options & OPTION_PLAIN) {
        while (TRUE) {
+           chew();
+           proutn(_("Please type in a secret password- "));
            scan();
            strcpy(game.passwd, citem);
-           chew();
            if (*game.passwd != 0) break;
-           proutn(_("Please type in a secret password-"));
        }
     } else {
        int i;