X-Git-Url: https://jxself.org/git/?p=super-star-trek.git;a=blobdiff_plain;f=src%2Freports.c;h=0e3ad48ca9ac8fe1c63d549ff0ba80c8eb7800f3;hp=7ea7c171f3374ba5dad7d6b7f8b8cd48eeeac2ea;hb=4207ce95e80fe7e2d5114079fa4255e0ad506618;hpb=ad1478c7cc24b761592a1e355015b44b243aeeda

diff --git a/src/reports.c b/src/reports.c
index 7ea7c17..0e3ad48 100644
--- a/src/reports.c
+++ b/src/reports.c
@@ -35,24 +35,24 @@ void report(void)
     char *s1,*s2,*s3;
 
     chew();
-    s1 = (game.thawed?"thawed ":"");
+    s1 = (game.thawed?_("thawed "):"");
     switch (game.length) {
-    case 1: s2="short"; break;
-    case 2: s2="medium"; break;
-    case 4: s2="long"; break;
-    default: s2="unknown length"; break;
+    case 1: s2=_("short"); break;
+    case 2: s2=_("medium"); break;
+    case 4: s2=_("long"); break;
+    default: s2=_("unknown length"); break;
     }
     switch (game.skill) {
-    case SKILL_NOVICE: s3="novice"; break;
-    case SKILL_FAIR: s3="fair"; break;
-    case SKILL_GOOD: s3="good"; break;
-    case SKILL_EXPERT: s3="expert"; break;
-    case SKILL_EMERITUS: s3="emeritus"; break;
-    default: s3="skilled"; break;
+    case SKILL_NOVICE: s3=_("novice"); break;
+    case SKILL_FAIR: s3=_("fair"); break;
+    case SKILL_GOOD: s3=_("good"); break;
+    case SKILL_EXPERT: s3=_("expert"); break;
+    case SKILL_EMERITUS: s3=_("emeritus"); break;
+    default: s3=_("skilled"); break;
     }
     prout("");
-    prout(_("You %s playing a %s%s %s game."),
-	  game.alldone? _("were") : _("are now"), s1, s2, s3);
+    prout(_("You %s a %s%s %s game."),
+	  game.alldone? _("were playing") : _("are playing"), s1, s2, s3);
     if (game.skill>SKILL_GOOD && game.thawed && !game.alldone) prout(_("No plaque is allowed."));
     if (game.tourn) prout(_("This is tournament game %d."), game.tourn);
     prout(_("Your secret password is \"%s\""),game.passwd);
@@ -71,11 +71,11 @@ void report(void)
 	prout(_(" destroyed, %d remaining."), game.state.rembase);
     }
     else prout(_("There are %d bases."), game.inbase);
-    if (!damaged(DRADIO) || game.condit == IHDOCKED || game.iseenit) {
+    if (!damaged(DRADIO) || game.condition == docked || game.iseenit) {
 	/* Don't report this if not seen and
 	   either the radio is dead or not at base! */
 	attakreport(false);
-	game.iseenit = 1;
+	game.iseenit = true;
     }
     if (game.casual) prout(_("%d casualt%s suffered so far."),
 		      game.casual, game.casual==1? "y" : "ies");
@@ -89,7 +89,7 @@ void report(void)
 	if (game.nprobes!=1) proutn(_("s"));
 	prout(".");
     }
-    if ((!damaged(DRADIO) || game.condit == IHDOCKED)
+    if ((!damaged(DRADIO) || game.condition == docked)
 		&& is_scheduled(FDSPROB)) {
 	if (game.isarmed) 
 	    proutn(_("An armed deep space probe is in"));
@@ -122,7 +122,7 @@ void lrscan(void)
     chew();
     if (damaged(DLRSENS)) {
 	/* Now allow base's sensors if docked */
-	if (game.condit != IHDOCKED) {
+	if (game.condition != docked) {
 	    prout(_("LONG-RANGE SENSORS DAMAGED."));
 	    return;
 	}
@@ -198,7 +198,7 @@ void chart(bool title)
     if (!damaged(DRADIO))
 	rechart();
 
-    if (game.lastchart < game.state.date && game.condit == IHDOCKED) {
+    if (game.lastchart < game.state.date && game.condition == docked) {
 	prout(_("Spock-  \"I revised the Star Chart from the starbase's records.\""));
 	rechart();
     }
@@ -241,12 +241,12 @@ static void sectscan(int goodScan, int i, int j)
 {
     if (goodScan || (abs(i-game.sector.x)<= 1 && abs(j-game.sector.y) <= 1)){
 	if ((game.quad[i][j]==IHMATER0)||(game.quad[i][j]==IHMATER1)||(game.quad[i][j]==IHMATER2)||(game.quad[i][j]==IHE)||(game.quad[i][j]==IHF)){
-	    switch (game.condit) {
-	    case IHRED: textcolor(RED); break;
-	    case IHGREEN: textcolor(GREEN); break;
-	    case IHYELLOW: textcolor(YELLOW); break;
-	    case IHDOCKED: textcolor(CYAN); break;
-	    case IHDEAD: textcolor(BROWN);
+	    switch (game.condition) {
+	    case red: textcolor(RED); break;
+	    case green: textcolor(GREEN); break;
+	    case yellow: textcolor(YELLOW); break;
+	    case docked: textcolor(CYAN); break;
+	    case dead: textcolor(BROWN);
 	    }
 	    if (game.quad[i][j] != game.ship) 
 		highvideo();
@@ -268,13 +268,13 @@ static void status(int req)
 	proutn(_("Stardate      %.1f, Time Left %.2f"), game.state.date, game.state.remtime);
 	break;
     case 2:
-	if (game.condit != IHDOCKED) newcnd();
-	switch (game.condit) {
-	case IHRED: cp = "RED"; break;
-	case IHGREEN: cp = "GREEN"; break;
-	case IHYELLOW: cp = "YELLOW"; break;
-	case IHDOCKED: cp = "DOCKED"; break;
-	case IHDEAD: cp="DEAD"; break;
+	if (game.condition != docked) newcnd();
+	switch (game.condition) {
+	case red: cp = _("RED"); break;
+	case green: cp = _("GREEN"); break;
+	case yellow: cp = _("YELLOW"); break;
+	case docked: cp = _("DOCKED"); break;
+	case dead: cp = _("DEAD"); break;
 	}
 	for (t=0;t<NDEVICES;t++)
 	    if (game.damage[t]>0) 
@@ -288,7 +288,7 @@ static void status(int req)
     case 4:
 	proutn(_("Life Support  "));
 	if (damaged(DLIFSUP)) {
-	    if (game.condit == IHDOCKED)
+	    if (game.condition == docked)
 		proutn(_("DAMAGED, Base provides"));
 	    else
 		proutn(_("DAMAGED, reserves=%4.2f"), game.lsupres);
@@ -325,7 +325,7 @@ static void status(int req)
 	if (game.options & OPTION_WORLDS) {
 	    int plnet = game.state.galaxy[game.quadrant.x][game.quadrant.y].planet;
 	    if (plnet != NOPLANET && game.state.plnets[plnet].inhabited != UNINHABITED)
-		proutn(_("Major system  %s"), systemname(plnet));
+		proutn(_("Major system  %s"), systnames[plnet]);
 	    else
 		proutn(_("Sector is uninhabited"));
 	}
@@ -337,7 +337,7 @@ static void status(int req)
     }
 }
 		
-int srscan(int l)
+void srscan(scantype type)
 /* short-range scan */
 {
     /* the "sy" request is undocumented */
@@ -346,11 +346,11 @@ int srscan(int l)
     
     int i, j, jj, req=0;
     int goodScan=true, leftside=true, rightside=true, title=false; 
-    switch (l) {
+    switch (type) {
     case SCAN_FULL: // SRSCAN
 	if (damaged(DSRSENS)) {
 	    /* Allow base's sensors if docked */
-	    if (game.condit != IHDOCKED) {
+	    if (game.condition != docked) {
 		prout(_("   S.R. SENSORS DAMAGED!"));
 		goodScan=false;
 	    }
@@ -379,9 +379,9 @@ int srscan(int l)
 		break;
 	if (req > sizeof(requests)/sizeof(requests[0])) {
 	    prout(_("UNRECOGNIZED REQUEST. Legal requests are:"));
-	    prout(_("  date, condition, position, lsupport, warpfactor,"));
-	    prout(_("  energy, torpedoes, shields, klingons, time, system, bases."));
-	    return false;
+	    prout(("  date, condition, position, lsupport, warpfactor,"));
+	    prout(("  energy, torpedoes, shields, klingons, time, system, bases."));
+	    return;
 	}
 	// no break
     case SCAN_STATUS: // STATUS
@@ -393,7 +393,7 @@ int srscan(int l)
 	leftside=false;
 	break;
     }
-    if (game.condit != IHDOCKED) newcnd();
+    if (game.condition != docked) newcnd();
     for (i = 1; i <= max(QUADSIZE, sizeof(requests)/sizeof(requests[0])); i++) {
 	jj = (req!=0 ? req : i);
 	if (leftside && i <= QUADSIZE) {
@@ -405,18 +405,17 @@ int srscan(int l)
 	if (rightside)
 	    status(jj);
 	if (i<sizeof(requests)/sizeof(requests[0])) skip(1);
-	if (req!=0) return(goodScan);
+	if (req!=0) return;
     }
     prout("");
     if (title) chart(true);
-    return(goodScan);
 }
 			
 			
 void eta(void)
 /* use computer to get estimated time of arrival for a warp jump */
 {
-    int ix1, ix2, iy1, iy2;
+    coord w1, w2;
     bool wfl, prompt = false;
     double ttime, twarp, tpower;
     if (damaged(DCOMPTR)) {
@@ -433,33 +432,33 @@ void eta(void)
 	    return;
 	}
     }
-    iy1 = aaitem +0.5;
+    w1.y = aaitem +0.5;
     if (scan() != IHREAL) {
 	huh();
 	return;
     }
-    ix1 = aaitem + 0.5;
+    w1.x = aaitem + 0.5;
     if (scan() == IHREAL) {
-	iy2 = aaitem + 0.5;
+	w2.y = aaitem + 0.5;
 	if (scan() != IHREAL) {
 	    huh();
 	    return;
 	}
-	ix2 = aaitem + 0.5;
+	w2.x = aaitem + 0.5;
     }
     else {
-	if (game.quadrant.y>ix1) ix2 = 1;
-	else ix2=QUADSIZE;
-	if (game.quadrant.x>iy1) iy2 = 1;
-	else iy2=QUADSIZE;
+	if (game.quadrant.y>w1.x) w2.x = 1;
+	else w2.x=QUADSIZE;
+	if (game.quadrant.x>w1.y) w2.y = 1;
+	else w2.y=QUADSIZE;
     }
 
-    if (!VALID_QUADRANT(ix1, iy1) || !VALID_SECTOR(ix2, iy2)) {
+    if (!VALID_QUADRANT(w1.x, w1.y) || !VALID_SECTOR(w2.x, w2.y)) {
 	huh();
 	return;
     }
-    game.dist = sqrt(square(iy1-game.quadrant.x+0.1*(iy2-game.sector.x))+
-		square(ix1-game.quadrant.y+0.1*(ix2-game.sector.y)));
+    game.dist = sqrt(square(w1.y-game.quadrant.y+0.1*(w2.y-game.sector.y))+
+		square(w1.x-game.quadrant.x+0.1*(w2.x-game.sector.x)));
     wfl = false;
 
     if (prompt) prout(_("Answer \"no\" if you don't know the value:"));
@@ -537,9 +536,9 @@ void eta(void)
 	    prout(_("Unfortunately, the Federation will be destroyed by then."));
 	if (twarp > 6.0)
 	    prout(_("You'll be taking risks at that speed, Captain"));
-	if ((game.isatb==1 && game.state.kscmdr.y == iy1 && game.state.kscmdr.x == ix1 &&
+	if ((game.isatb==1 && same(game.state.kscmdr, w1) &&
 	     scheduled(FSCDBAS)< ttime+game.state.date)||
-	    (scheduled(FCDBAS)<ttime+game.state.date && game.battle.y==iy1 && game.battle.x == ix1))
+	    (scheduled(FCDBAS)<ttime+game.state.date && same(game.battle, w1)))
 	    prout(_("The starbase there will be destroyed by then."));
 	proutn(_("New warp factor to try? "));
 	if (scan() == IHREAL) {
@@ -558,3 +557,74 @@ void eta(void)
     }
 			
 }
+
+#if BSD_BUG_FOR_BUG
+/*
+ *	A visual scan is made in a particular direction of three sectors
+ *	in the general direction specified.  This takes time, and
+ *	Klingons can attack you, so it should be done only when sensors
+ * 	are out.  Code swiped from BSD-Trek.  Not presently used, as we
+ *	automatically display all adjacent sectors on the short-range
+ *	scan even when short-range sensors are out.
+ */
+
+/* This struct[] has the delta x, delta y for particular directions */
+coord visdelta[] =
+{
+    {-1,-1},
+    {-1, 0},
+    {-1, 1},
+    {0,	 1},
+    {1,	 1},
+    {1,	 0},
+    {1,	-1},
+    {0,	-1},
+    {-1,-1},
+    {-1, 0},
+    {-1, 1},
+};
+
+void visual(void)
+{
+    int		co, ix, iy;
+    coord	*v;
+
+    if (scan() != IHREAL) {
+	chew();
+	proutn(_("Direction? "));
+	if (scan()!=IHREAL) {
+	    huh();
+	    return;
+	}
+    }
+    if (aaitem < 0.0 || aaitem > 360.0)
+	return;
+    co = (aaitem + 22) / 45;
+    v = &visdelta[co];
+    ix = game.sector.x + v->x;
+    iy = game.sector.y + v->y;
+    if (ix < 0 || ix >= QUADSIZE || iy < 0 || iy >= QUADSIZE)
+	co = '?';
+    else
+	co = game.quad[ix][iy];
+    printf("%d,%d %c ", ix, iy, co);
+    v++;
+    ix = game.sector.x + v->x;
+    iy = game.sector.y + v->y;
+    if (ix < 0 || ix >= QUADSIZE || iy < 0 || iy >= QUADSIZE)
+	co = '?';
+    else
+	co = game.quad[ix][iy];
+    printf("%c ", co);
+    v++;
+    ix = game.sector.x + v->x;
+    iy = game.sector.y + v->y;
+    if (ix < 0 || ix >= QUADSIZE || iy < 0 || iy >= QUADSIZE)
+	co = '?';
+    else
+	co = game.quad[ix][iy];
+    printf("%c %d,%d\n", co, ix, iy);
+    game.optime = 0.5;
+    game.ididit = true;
+}
+#endif