X-Git-Url: https://jxself.org/git/?p=super-star-trek.git;a=blobdiff_plain;f=src%2Fplanets.c;h=ca8996fc360ceb843031638b84ffe855ef56b196;hp=ca8c890c6256a92e43df6d428ddb10271bf0d085;hb=4207ce95e80fe7e2d5114079fa4255e0ad506618;hpb=0f68a074434296ae409accdc39ba0142600ea255

diff --git a/src/planets.c b/src/planets.c
index ca8c890..ca8996f 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 != 0)
+	    && game.state.plnets[i].crystals != absent)
 	    || (idebug && game.state.plnets[i].w.x !=0)
 	    ) {
 	    iknow = true;
@@ -33,7 +33,7 @@ void preport(void)
 	    proutn(_("   class "));
 	    proutn(classes[game.state.plnets[i].pclass]);
 	    proutn("   ");
-	    if (game.state.plnets[i].crystals <= 0) proutn(_("no "));
+	    if (game.state.plnets[i].crystals != present) proutn(_("no "));
 	    prout(_("dilithium crystals present."));
 	    if (game.state.plnets[i].known==shuttle_down) 
 		prout(_("    Shuttle Craft Galileo on surface."));
@@ -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);
@@ -93,7 +93,7 @@ void sensor(void)
 	if (game.state.plnets[game.iplnet].known==shuttle_down) 
 	    prout(_("         Sensors show Galileo still on surface."));
 	proutn(_("         Readings indicate"));
-	if (game.state.plnets[game.iplnet].crystals == 0) proutn(_(" no"));
+	if (game.state.plnets[game.iplnet].crystals != present) proutn(_(" no"));
 	prout(_(" dilithium crystals present.\""));
 	if (game.state.plnets[game.iplnet].known == unknown) game.state.plnets[game.iplnet].known = known;
     }
@@ -147,7 +147,7 @@ void beam(void)
     }
     else {
 	/* Going to planet */
-	if (game.state.plnets[game.iplnet].crystals==0) {
+	if (game.state.plnets[game.iplnet].crystals==absent) {
 	    prout(_("Spock-  \"Captain, I fail to see the logic in"));
 	    prout(_("  exploring a planet with no dilithium crystals."));
 	    proutn(_("  Are you sure this is wise?\" "));
@@ -197,11 +197,11 @@ void mine(void)
 	prout(_("Mining party not on planet."));
 	return;
     }
-    if (game.state.plnets[game.iplnet].crystals == MINED) {
+    if (game.state.plnets[game.iplnet].crystals == mined) {
 	prout(_("This planet has already been strip-mined for dilithium."));
 	return;
     }
-    else if (game.state.plnets[game.iplnet].crystals == 0) {
+    else if (game.state.plnets[game.iplnet].crystals == absent) {
 	prout(_("No dilithium crystals on this planet."));
 	return;
     }
@@ -219,7 +219,7 @@ void mine(void)
     game.optime = (0.1+0.2*Rand())*game.state.plnets[game.iplnet].pclass;
     if (consumeTime()) return;
     prout(_("Mining operation complete."));
-    game.state.plnets[game.iplnet].crystals = MINED;
+    game.state.plnets[game.iplnet].crystals = mined;
     game.imine = game.ididit = true;
 }
 
@@ -503,71 +503,3 @@ void deathray(void)
     finish(FTRIBBLE);
     return;
 }
-
-char *systemname(int pindx)
-/* return the name of a given solar system */
-{
-    static char copy[BUFSIZ];
-    /* the below array should not be static, or it won't gettextize
-     * because of the early initialization. */
-    char *names[NINHAB+1] =
-    {
-	/*
-	 * I used <http://www.memory-alpha.org> 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
-    };
-
-    strcpy(copy, names[pindx]);
-    return copy;
-}