X-Git-Url: https://jxself.org/git/?p=super-star-trek.git;a=blobdiff_plain;f=src%2Fsetup.c;h=8963b6ce383866edb28c38655fcabe4aa35bb2e4;hp=0f96a5c1a7e3caf650d87f82b70d80a4aca479d2;hb=9ae916e9144e84ef1de4a86ea73a45a2bc4cc1be;hpb=c94108fede4723af905386473f6435467e96e630 diff --git a/src/setup.c b/src/setup.c index 0f96a5c..8963b6c 100644 --- a/src/setup.c +++ b/src/setup.c @@ -12,10 +12,10 @@ void prelim(void) /* issue a historically correct banner */ { skip(2); - prout("-SUPER- STAR TREK"); + prout(_("-SUPER- STAR TREK")); skip(1); #ifdef __HISTORICAL__ - prout("Latest update-21 Sept 78"); + prout(_("Latest update-21 Sept 78")); skip(1); #endif /* __HISTORICAL__ */ } @@ -63,7 +63,7 @@ bool thaw(void) game.passwd[0] = '\0'; if ((key = scan()) == IHEOL) { - proutn("File name: "); + proutn(_("File name: ")); key = scan(); } if (key != IHALPHA) { @@ -75,14 +75,15 @@ bool thaw(void) strcat(citem, ".trk"); } if ((fp = fopen(citem, "rb")) == NULL) { - proutn("Can't find game file "); + proutn(_("Can't find game file ")); proutn(citem); skip(1); return 1; } fread(&game, sizeof(game), 1, fp); if (feof(fp) || ftell(fp) != filelength(fileno(fp)) || strcmp(game.magic, SSTMAGIC)) { - prout("Game file format is bad, should begin with " SSTMAGIC); + proutn(_("Game file format is bad, should begin with ")); + prout(SSTMAGIC); skip(1); fclose(fp); return 1; @@ -93,138 +94,92 @@ bool thaw(void) return false; } -/* -** Abandon Ship -** -** The ship is abandoned. If your current ship is the Faire -** Queene, or if your shuttlecraft is dead, you're out of -** luck. You need the shuttlecraft in order for the captain -** (that's you!!) to escape. -** -** Your crew can beam to an inhabited starsystem in the -** quadrant, if there is one and if the transporter is working. -** If there is no inhabited starsystem, or if the transporter -** is out, they are left to die in outer space. -** -** If there are no starbases left, you are captured by the -** Klingons, who torture you mercilessly. However, if there -** is at least one starbase, you are returned to the -** Federation in a prisoner of war exchange. Of course, this -** can't happen unless you have taken some prisoners. -** -*/ - -void abandn(void) -/* abandon ship */ +#define SYSTEM_NAMES \ + { \ + /* \ + * I used to find planets \ + * with references in ST:TOS. Eath and the Alpha Centauri \ + * Colony have been omitted. \ + * \ + * Some planets marked Class G and P here will be displayed as class M \ + * because of the way planets are generated. This is a known bug. \ + */ \ + "ERROR", \ + /* Federation Worlds */ \ + _("Andoria (Fesoan)"), /* several episodes */ \ + _("Tellar Prime (Miracht)"), /* TOS: "Journey to Babel" */ \ + _("Vulcan (T'Khasi)"), /* many episodes */ \ + _("Medusa"), /* TOS: "Is There in Truth No Beauty?" */ \ + _("Argelius II (Nelphia)"),/* TOS: "Wolf in the Fold" ("IV" in BSD) */ \ + _("Ardana"), /* TOS: "The Cloud Minders" */ \ + _("Catulla (Cendo-Prae)"), /* TOS: "The Way to Eden" */ \ + _("Gideon"), /* TOS: "The Mark of Gideon" */ \ + _("Aldebaran III"), /* TOS: "The Deadly Years" */ \ + _("Alpha Majoris I"), /* TOS: "Wolf in the Fold" */ \ + _("Altair IV"), /* TOS: "Amok Time */ \ + _("Ariannus"), /* TOS: "Let That Be Your Last Battlefield" */ \ + _("Benecia"), /* TOS: "The Conscience of the King" */ \ + _("Beta Niobe I (Sarpeidon)"), /* TOS: "All Our Yesterdays" */ \ + _("Alpha Carinae II"), /* TOS: "The Ultimate Computer" */ \ + _("Capella IV (Kohath)"), /* TOS: "Friday's Child" (Class G) */ \ + _("Daran V"), /* TOS: "For the World is Hollow and I Have Touched the Sky" */ \ + _("Deneb II"), /* TOS: "Wolf in the Fold" ("IV" in BSD) */ \ + _("Eminiar VII"), /* TOS: "A Taste of Armageddon" */ \ + _("Gamma Canaris IV"), /* TOS: "Metamorphosis" */ \ + _("Gamma Tranguli VI (Vaalel)"), /* TOS: "The Apple" */ \ + _("Ingraham B"), /* TOS: "Operation: Annihilate" */ \ + _("Janus IV"), /* TOS: "The Devil in the Dark" */ \ + _("Makus III"), /* TOS: "The Galileo Seven" */ \ + _("Marcos XII"), /* TOS: "And the Children Shall Lead", */ \ + _("Omega IV"), /* TOS: "The Omega Glory" */ \ + _("Regulus V"), /* TOS: "Amok Time */ \ + _("Deneva"), /* TOS: "Operation -- Annihilate!" */ \ + /* Worlds from BSD Trek */ \ + _("Rigel II"), /* TOS: "Shore Leave" ("III" in BSD) */ \ + _("Beta III"), /* TOS: "The Return of the Archons" */ \ + _("Triacus"), /* TOS: "And the Children Shall Lead", */ \ + _("Exo III"), /* TOS: "What Are Little Girls Made Of?" (Class P) */ \ + } +#if 0 /* Others */ + _("Hansen's Planet"), /* TOS: "The Galileo Seven" */ + _("Taurus IV"), /* TOS: "The Galileo Seven" (class G) */ + _("Antos IV (Doraphane)"), /* TOS: "Whom Gods Destroy", "Who Mourns for Adonais?" */ + _("Izar"), /* TOS: "Whom Gods Destroy" */ + _("Tiburon"), /* TOS: "The Way to Eden" */ + _("Merak II"), /* TOS: "The Cloud Minders" */ + _("Coridan (Desotriana)"), /* TOS: "Journey to Babel" */ + _("Iotia"), /* TOS: "A Piece of the Action" */ +#endif + +#define DEVICE_NAMES \ + { \ + _("S. R. Sensors"), \ + _("L. R. Sensors"), \ + _("Phasers"), \ + _("Photon Tubes"), \ + _("Life Support"), \ + _("Warp Engines"), \ + _("Impulse Engines"), \ + _("Shields"), \ + _("Subspace Radio"), \ + _("Shuttle Craft"), \ + _("Computer"), \ + _("Navigation System"), \ + _("Transporter"), \ + _("Shield Control"), \ + _("Death Ray"), \ + _("D. S. Probe") \ + } + +static void setup_names(void) +/* Sets up some arrays with localized names. + * Must be done after iostart() for localization to work. */ { - int nb, l; - struct quadrant *q; + char *tmp1[ARRAY_SIZE(systnames)] = SYSTEM_NAMES; + char *tmp2[ARRAY_SIZE(device)] = DEVICE_NAMES; - chew(); - if (game.condition==docked) { - if (game.ship!=IHE) { - prout("You cannot abandon Ye Faerie Queene."); - return; - } - } - else { - /* Must take shuttle craft to exit */ - if (game.damage[DSHUTTL]==-1) { - prout("Ye Faerie Queene has no shuttle craft."); - return; - } - if (game.damage[DSHUTTL]<0) { - prout("Shuttle craft now serving Big Macs."); - return; - } - if (game.damage[DSHUTTL]>0) { - prout("Shuttle craft damaged."); - return; - } - if (game.landed==1) { - prout("You must be aboard the Enterprise."); - return; - } - if (game.iscraft!=1) { - prout("Shuttle craft not currently available."); - return; - } - /* Print abandon ship messages */ - skip(1); - prouts("***ABANDON SHIP! ABANDON SHIP!"); - skip(1); - prouts("***ALL HANDS ABANDON SHIP!"); - skip(2); - prout("Captain and crew escape in shuttle craft."); - if (game.state.rembase==0) { - /* Oops! no place to go... */ - finish(FABANDN); - return; - } - q = &game.state.galaxy[game.quadrant.x][game.quadrant.y]; - /* Dispose of crew */ - if (!(game.options & OPTION_WORLDS) && !damaged(DTRANSP)) { - prout("Remainder of ship's complement beam down"); - prout("to nearest habitable planet."); - } else if (q->planet != NOPLANET && !damaged(DTRANSP)) { - prout("Remainder of ship's complement beam down"); - prout("to %s.", systemname(q->planet)); - } else { - prout("Entire crew of %d left to die in outer space."); - game.casual += game.state.crew; - game.abandoned += game.state.crew; - } - - /* If at least one base left, give 'em the Faerie Queene */ - skip(1); - game.icrystl = false; /* crystals are lost */ - game.nprobes = 0; /* No probes */ - prout("You are captured by Klingons and released to"); - prout("the Federation in a prisoner-of-war exchange."); - nb = Rand()*game.state.rembase+1; - /* Set up quadrant and position FQ adjacient to base */ - if (!same(game.quadrant, game.state.baseq[nb])) { - game.quadrant = game.state.baseq[nb]; - game.sector.x = game.sector.y = 5; - newqad(true); - } - for (;;) { - /* position next to base by trial and error */ - game.quad[game.sector.x][game.sector.y] = IHDOT; - for_sectors(l) { - game.sector.x = 3.0*Rand() - 1.0 + game.base.x; - game.sector.y = 3.0*Rand() - 1.0 + game.base.y; - if (VALID_SECTOR(game.sector.x, game.sector.y) && - game.quad[game.sector.x][game.sector.y] == IHDOT) break; - } - if (l < QUADSIZE+1) break; /* found a spot */ - game.sector.x=QUADSIZE/2; - game.sector.y=QUADSIZE/2; - newqad(true); - } - } - /* Get new commission */ - game.quad[game.sector.x][game.sector.y] = game.ship = IHF; - game.state.crew = FULLCREW; - prout("Starfleet puts you in command of another ship,"); - prout("the Faerie Queene, which is antiquated but,"); - prout("still useable."); - if (game.icrystl) prout("The dilithium crystals have been moved."); - game.imine = false; - game.iscraft=0; /* Galileo disappears */ - /* Resupply ship */ - game.condition=docked; - for (l = 0; l < NDEVICES; l++) - game.damage[l] = 0.0; - game.damage[DSHUTTL] = -1; - game.energy = game.inenrg = 3000.0; - game.shield = game.inshld = 1250.0; - game.torps = game.intorps = 6; - game.lsupres=game.inlsr=3.0; - game.shldup=false; - game.warpfac=5.0; - game.wfacsq=25.0; - return; + memcpy(systnames, tmp1, sizeof(systnames)); + memcpy(device, tmp2, sizeof(device)); } void setup(bool needprompt) @@ -232,6 +187,10 @@ void setup(bool needprompt) { int i,j, krem, klumper; coord w; + + /* call the setup hooks here */ + setup_names(); + // Decide how many of everything if (choose(needprompt)) return; // frozen game // Prepare the Enterprise @@ -240,7 +199,7 @@ void setup(bool needprompt) game.state.crew = FULLCREW; game.energy = game.inenrg = 5000.0; game.shield = game.inshld = 2500.0; - game.shldchg = 0; + game.shldchg = false; game.shldup = false; game.inlsr = 4.0; game.lsupres = 4.0; @@ -253,15 +212,15 @@ 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.resting = game.imine = game.icrystl = game.icraft = false; - game.isatb = game.iscate = game.state.nplankl = 0; + game.iscate = game.resting = game.imine = game.icrystl = game.icraft = false; + game.isatb = game.state.nplankl = 0; game.state.starkl = game.state.basekl = 0; - game.iscraft = 1; - game.landed = -1; - game.alive = 1; + game.iscraft = onship; + game.landed = false; + game.alive = true; game.docfac = 0.25; for_quadrants(i) for_quadrants(j) { @@ -270,8 +229,8 @@ void setup(bool needprompt) quad->planet = NOPLANET; quad->romulans = 0; quad->klingons = 0; - quad->starbase = 0; - quad->supernova = 0; + quad->starbase = false; + quad->supernova = false; quad->status = secure; } // Initialize times for extraneous events @@ -326,8 +285,8 @@ void setup(bool needprompt) } while (contflag); game.state.baseq[i] = w; - game.state.galaxy[w.x][w.y].starbase = 1; - game.state.chart[w.x][w.y].starbase = 1; + game.state.galaxy[w.x][w.y].starbase = true; + game.state.chart[w.x][w.y].starbase = true; } // Position ordinary Klingon Battle Cruisers krem = game.inkling; @@ -337,7 +296,8 @@ void setup(bool needprompt) do { double r = Rand(); int klump = (1.0 - r*r)*klumper; - if (klump > krem) klump = krem; + if (klump > krem) + klump = krem; krem -= klump; do w = randplace(GALSIZE); while (game.state.galaxy[w.x][w.y].supernova || @@ -365,7 +325,8 @@ void setup(bool needprompt) game.state.galaxy[w.x][w.y].klingons > 8); // check for duplicate for (j = 1; j < i; j++) - if (game.state.kcmdr[j].x==w.x && game.state.kcmdr[j].y==w.y) break; + if (same(game.state.kcmdr[j], w)) + break; } while (j < i); game.state.galaxy[w.x][w.y].klingons++; game.state.kcmdr[i] = w; @@ -377,12 +338,12 @@ void setup(bool needprompt) game.state.plnets[i].w = w; if (i < NINHAB) { game.state.plnets[i].pclass = M; // All inhabited planets are class M - game.state.plnets[i].crystals = 0; + game.state.plnets[i].crystals = absent; game.state.plnets[i].known = known; game.state.plnets[i].inhabited = i; } else { game.state.plnets[i].pclass = Rand()*3.0; // Planet class M N or O - game.state.plnets[i].crystals = 1.5*Rand(); // 1 in 3 chance of crystals + game.state.plnets[i].crystals = Rand()*1.5; // 1 in 3 chance of crystals game.state.plnets[i].known = unknown; game.state.plnets[i].inhabited = UNINHABITED; } @@ -405,52 +366,54 @@ void setup(bool needprompt) if (thing.x != -1) { thing = randplace(GALSIZE); } - else { - thing.x = thing.y = 0; - } + else + invalidate(thing); -// idate = date; skip(2); - game.state.snap = 0; + game.state.snap = false; if (game.skill == SKILL_NOVICE) { - prout("It is stardate %d. The Federation is being attacked by", + prout(_("It is stardate %d. The Federation is being attacked by"), (int)game.state.date); - prout("a deadly Klingon invasion force. As captain of the United"); - prout("Starship U.S.S. Enterprise, it is your mission to seek out"); - prout("and destroy this invasion force of %d battle cruisers.", + prout(_("a deadly Klingon invasion force. As captain of the United")); + prout(_("Starship U.S.S. Enterprise, it is your mission to seek out")); + prout(_("and destroy this invasion force of %d battle cruisers."), 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(""); - prout("You will have %d supporting starbases.", game.inbase); - proutn("Starbase locations- "); + 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.")); + skip(1); + prout(_("You will have %d supporting starbases."), game.inbase); + proutn(_("Starbase locations- ")); } else { - prout("Stardate %d.", (int)game.state.date); - prout(""); - prout("%d Klingons.", INKLINGTOT); - prout("An unknown number of Romulans."); - if (game.state.nscrem) prout("and one (GULP) Super-Commander."); - prout("%d stardates.",(int)game.intime); - proutn("%d starbases in ", game.inbase); + prout(_("Stardate %d."), (int)game.state.date); + skip(1); + prout(_("%d Klingons."), INKLINGTOT); + prout(_("An unknown number of Romulans.")); + if (game.state.nscrem) + prout(_("And one (GULP) Super-Commander.")); + prout(_("%d stardates."),(int)game.intime); + proutn(_("%d starbases in "), game.inbase); } for (i = 1; i <= game.inbase; i++) { proutn(cramlc(0, game.state.baseq[i])); proutn(" "); } skip(2); - proutn("The Enterprise is currently in "); + proutn(_("The Enterprise is currently in ")); proutn(cramlc(quadrant, game.quadrant)); proutn(" "); proutn(cramlc(sector, game.sector)); skip(2); - prout("Good Luck!"); - if (game.state.nscrem) prout(" YOU'LL NEED IT."); + prout(_("Good Luck!")); + if (game.state.nscrem) + prout(_(" YOU'LL NEED IT.")); waitfor(); newqad(false); - if (game.nenhere-iqhere-game.ithere) game.shldup = true; - if (game.neutz) attack(0); // bad luck to start in a Romulan Neutral Zone + if (game.nenhere-iqhere-game.ithere) + game.shldup = true; + if (game.neutz) // bad luck to start in a Romulan Neutral Zone + attack(false); } bool choose(bool needprompt) @@ -462,12 +425,12 @@ bool choose(bool needprompt) game.skill = SKILL_NONE; game.length = 0; if (needprompt) /* Can start with command line options */ - proutn("Would you like a regular, tournament, or saved game? "); + proutn(_("Would you like a regular, tournament, or saved game? ")); scan(); if (strlen(citem)==0) continue; // Try again if (isit("tournament")) { while (scan() == IHEOL) { - proutn("Type in tournament number-"); + proutn(_("Type in tournament number-")); } if (aaitem == 0) { chew(); @@ -479,46 +442,60 @@ bool choose(bool needprompt) break; } if (isit("saved") || isit("frozen")) { - if (thaw()) continue; + if (thaw()) + continue; chew(); - if (*game.passwd==0) continue; - if (!game.alldone) game.thawed = 1; // No plaque if not finished + if (*game.passwd==0) + continue; + if (!game.alldone) + game.thawed = true; // No plaque if not finished report(); waitfor(); return true; } - if (isit("regular")) break; - proutn("What is \""); + if (isit("regular")) + break; + proutn(_("What is \"")); proutn(citem); prout("\"?"); chew(); } while (game.length==0 || game.skill==SKILL_NONE) { if (scan() == IHALPHA) { - if (isit("short")) game.length = 1; - else if (isit("medium")) game.length = 2; - else if (isit("long")) game.length = 4; - else if (isit("novice")) game.skill = SKILL_NOVICE; - else if (isit("fair")) game.skill = SKILL_FAIR; - else if (isit("good")) game.skill = SKILL_GOOD; - else if (isit("expert")) game.skill = SKILL_EXPERT; - else if (isit("emeritus")) game.skill = SKILL_EMERITUS; + if (isit("short")) + game.length = 1; + else if (isit("medium")) + game.length = 2; + else if (isit("long")) + game.length = 4; + else if (isit("novice")) + game.skill = SKILL_NOVICE; + else if (isit("fair")) + game.skill = SKILL_FAIR; + else if (isit("good")) + game.skill = SKILL_GOOD; + else if (isit("expert")) + game.skill = SKILL_EXPERT; + else if (isit("emeritus")) + game.skill = SKILL_EMERITUS; else { - proutn("What is \""); + proutn(_("What is \"")); proutn(citem); prout("\"?"); } } else { chew(); - if (game.length==0) proutn("Would you like a Short, Medium, or Long game? "); - else if (game.skill == SKILL_NONE) proutn("Are you a Novice, Fair, Good, Expert, or Emeritus player? "); + if (game.length==0) + proutn(_("Would you like a Short, Medium, or Long game? ")); + else if (game.skill == SKILL_NONE) + proutn(_("Are you a Novice, Fair, Good, Expert, or Emeritus player? ")); } } // Choose game options -- added by ESR for SST2K if (scan() != IHALPHA) { chew(); - proutn("Choose your game style (or just press enter): "); + proutn(_("Choose your game style (or just press enter): ")); scan(); } if (isit("plain")) { @@ -534,7 +511,7 @@ bool choose(bool needprompt) else if (isit("fancy")) /* do nothing */; else if (strlen(citem)) { - proutn("What is \""); + proutn(_("What is \"")); proutn(citem); prout("\"?"); } @@ -580,10 +557,12 @@ void newcnd(void) /* update our alert status */ { game.condition = green; - if (game.energy < 1000.0) game.condition = yellow; + if (game.energy < 1000.0) + game.condition = yellow; if (game.state.galaxy[game.quadrant.x][game.quadrant.y].klingons || game.state.galaxy[game.quadrant.x][game.quadrant.y].romulans) game.condition = red; - if (!game.alive) game.condition=dead; + if (!game.alive) + game.condition=dead; } coord newkling(int i) @@ -603,19 +582,18 @@ void newqad(bool shutup) coord w; struct quadrant *q; - game.iattak = 1; 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; game.nenhere = 0; game.neutz = false; game.inorbit = false; - game.landed = -1; + game.landed = false; game.ientesc = false; game.ithere = false; iqhere = false; @@ -623,7 +601,7 @@ void newqad(bool shutup) game.iseenit = false; if (game.iscate) { // Attempt to escape Super-commander, so tbeam back! - game.iscate = 0; + game.iscate = false; game.ientesc = true; } // Clear quadrant @@ -661,7 +639,7 @@ void newqad(bool shutup) if (same(game.quadrant, game.state.kscmdr)) { game.quad[game.ks[1].x][game.ks[1].y] = IHS; game.kpower[1] = 1175.0 + 400.0*Rand() + 125.0*game.skill; - game.iscate = game.state.remkl>1; + game.iscate = (game.state.remkl > 1); game.ishere = true; } } @@ -695,11 +673,11 @@ void newqad(bool shutup) game.neutz = true; if (!damaged(DRADIO)) { skip(1); - prout("LT. Uhura- \"Captain, an urgent message."); - prout(" I'll put it on audio.\" CLICK"); + prout(_("LT. Uhura- \"Captain, an urgent message.")); + prout(_(" I'll put it on audio.\" CLICK")); skip(1); - prout("INTRUDER! YOU HAVE VIOLATED THE ROMULAN NEUTRAL ZONE."); - prout("LEAVE AT ONCE, OR YOU WILL BE DESTROYED!"); + prout(_("INTRUDER! YOU HAVE VIOLATED THE ROMULAN NEUTRAL ZONE.")); + prout(_("LEAVE AT ONCE, OR YOU WILL BE DESTROYED!")); } } @@ -709,15 +687,15 @@ void newqad(bool shutup) w = dropin(IHQUEST); thing = randplace(GALSIZE); game.nenhere++; - iqhere=1; + iqhere = true; game.ks[game.nenhere] = w; game.kdist[game.nenhere] = game.kavgd[game.nenhere] = distance(game.sector, w); game.kpower[game.nenhere] = Rand()*6000.0 +500.0 +250.0*game.skill; if (!damaged(DSRSENS)) { skip(1); - prout("MR. SPOCK- \"Captain, this is most unusual."); - prout(" Please examine your short-range scan.\""); + prout(_("Mr. Spock- \"Captain, this is most unusual.")); + prout(_(" Please examine your short-range scan.\"")); } } } @@ -740,10 +718,14 @@ void newqad(bool shutup) distance(game.sector, game.tholian); game.kpower[game.nenhere] = Rand()*400.0 +100.0 +25.0*game.skill; /* Reserve unocupied corners */ - if (game.quad[1][1]==IHDOT) game.quad[1][1] = 'X'; - if (game.quad[1][QUADSIZE]==IHDOT) game.quad[1][QUADSIZE] = 'X'; - if (game.quad[QUADSIZE][1]==IHDOT) game.quad[QUADSIZE][1] = 'X'; - if (game.quad[QUADSIZE][QUADSIZE]==IHDOT) game.quad[QUADSIZE][QUADSIZE] = 'X'; + if (game.quad[1][1]==IHDOT) + game.quad[1][1] = 'X'; + if (game.quad[1][QUADSIZE]==IHDOT) + game.quad[1][QUADSIZE] = 'X'; + if (game.quad[QUADSIZE][1]==IHDOT) + game.quad[QUADSIZE][1] = 'X'; + if (game.quad[QUADSIZE][QUADSIZE]==IHDOT) + game.quad[QUADSIZE][QUADSIZE] = 'X'; } } @@ -756,10 +738,14 @@ void newqad(bool shutup) // Take out X's in corners if Tholian present if (game.ithere) { - if (game.quad[1][1]=='X') game.quad[1][1] = IHDOT; - if (game.quad[1][QUADSIZE]=='X') game.quad[1][QUADSIZE] = IHDOT; - if (game.quad[QUADSIZE][1]=='X') game.quad[QUADSIZE][1] = IHDOT; - if (game.quad[QUADSIZE][QUADSIZE]=='X') game.quad[QUADSIZE][QUADSIZE] = IHDOT; + if (game.quad[1][1]=='X') + game.quad[1][1] = IHDOT; + if (game.quad[1][QUADSIZE]=='X') + game.quad[1][QUADSIZE] = IHDOT; + if (game.quad[QUADSIZE][1]=='X') + game.quad[QUADSIZE][1] = IHDOT; + if (game.quad[QUADSIZE][QUADSIZE]=='X') + game.quad[QUADSIZE][QUADSIZE] = IHDOT; } } @@ -772,7 +758,8 @@ void sortkl(void) // The author liked bubble sort. So we will use it. :-( - if (game.nenhere-iqhere-game.ithere < 2) return; + if (game.nenhere-iqhere-game.ithere < 2) + return; do { sw = false; @@ -801,17 +788,19 @@ 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-")); + if (*game.passwd != 0) + break; } } else { int i; - for(i=0;i<3;i++) game.passwd[i]=(char)(97+(int)(Rand()*25)); + for(i=0;i<3;i++) + game.passwd[i]=(char)(97+(int)(Rand()*25)); game.passwd[3]=0; } }