X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=src%2Freports.c;h=3c672186f7d6a9aeb9deec00d80312b05c9fdb7d;hb=b40eba51deeb13f362e95416c005156be4104067;hp=93a525d8abc0bbb1d706b6bb7fc051955e2965eb;hpb=9ae916e9144e84ef1de4a86ea73a45a2bc4cc1be;p=super-star-trek.git

diff --git a/src/reports.c b/src/reports.c
index 93a525d..3c67218 100644
--- a/src/reports.c
+++ b/src/reports.c
@@ -3,7 +3,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-void attakreport(bool curt)
+void attackreport(bool curt)
 /* report status of bases under attack */
 {
     if (!curt) {
@@ -82,9 +82,9 @@ void report(void)
     else
 	prout(_("There are %d bases."), game.inbase);
     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);
+	// Don't report this if not seen and
+	// either the radio is dead or not at base!
+	attackreport(false);
 	game.iseenit = true;
     }
     if (game.casual) 
@@ -166,7 +166,7 @@ void lrscan(void)
     }
 }
 
-void dreprt(void) 
+void damagereport(void) 
 /* damage report */
 {
     bool jdam = false;
@@ -195,8 +195,8 @@ void rechart(void)
 {
     int i, j;
     game.lastchart = game.state.date;
-    for_quadrants(i)
-	for_quadrants(j) 
+    for (i = 1; i <= GALSIZE; i++)
+	for (j = 1; j <= GALSIZE; j++)
 	    if (game.state.galaxy[i][j].charted) {
 		game.state.chart[i][j].klingons = game.state.galaxy[i][j].klingons;
 		game.state.chart[i][j].starbase = game.state.galaxy[i][j].starbase;
@@ -223,9 +223,9 @@ void chart(void)
 	prout(_("(Last surveillance update %d stardates ago)."),
 	      (int)(game.state.date-game.lastchart));
     prout("      1    2    3    4    5    6    7    8");
-    for_quadrants(i) {
+    for (i = 1; i <= GALSIZE; i++) {
 	proutn("%d |", i);
-	for_quadrants(j) {
+	for (j = 1; j <= GALSIZE; j++) {
 	    char buf[4];
 	    if ((game.options & OPTION_SHOWME) && i == game.quadrant.x && j == game.quadrant.y)
 		proutn("<");
@@ -350,7 +350,7 @@ void status(int req)
     RQ(10,
 	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)
+	    if (plnet != NOPLANET && game.state.planets[plnet].inhabited != UNINHABITED)
 		prstat(_("Major system"), "%s", systnames[plnet]);
 	    else
 		prout(_("Sector is uninhabited"));
@@ -358,7 +358,7 @@ void status(int req)
     );
 
     RQ(11,
-	attakreport(!req);
+	attackreport(!req);
     );
 
 #undef RQ
@@ -412,7 +412,7 @@ void srscan(void)
 	newcnd();
     for (i = 1; i <= QUADSIZE; i++) {
 	proutn("%2d  ", i);
-	for_sectors(j) {
+	for (j = 1; j <= QUADSIZE; j++) {
 	    sectscan(goodScan, i, j);
 	}
 	skip(1);
@@ -480,7 +480,8 @@ void eta(void)
 	proutn(_("Time or arrival date? "));
 	if (scan()==IHREAL) {
 	    ttime = aaitem;
-	    if (ttime > game.state.date) ttime -= game.state.date; // Actually a star date
+	    if (ttime > game.state.date)
+		ttime -= game.state.date; // Actually a star date
 	    if (ttime <= 1e-10 ||
 		(twarp=(floor(sqrt((10.0*game.dist)/ttime)*10.0)+1.0)/10.0) > 10) {
 		prout(_("We'll never make it, sir."));