Better project documentation.

[super-star-trek.git] / reports.c

diff --git a/reports.c b/reports.c
index ccb13cd80a0ac465a6bc205e1f2abe1a19bb0c01..858c70cb479f66689b0b5b3ff3a3fda391658fa2 100644 (file)
--- a/reports.c
+++ b/reports.c
@@ -5,20 +5,16 @@
 \r
 void attakreport(void) {\r
        if (game.future[FCDBAS] < 1e30) {\r
-               proutn("Starbase in ");\r
-               cramlc(1, batx, baty);\r
-               prout(" is currently under attack.");\r
-               proutn("It can hold out until Stardate ");\r
-               cramf(game.future[FCDBAS], 0,1);\r
-               prout(".");\r
+               prout("Starbase in %s is currently under attack.",\r
+                     cramlc(quadrant, batx, baty));\r
+               prout("It can hold out until Stardate %d.", \r
+                     (int)game.future[FCDBAS]);\r
        }\r
        if (isatb == 1) {\r
-               proutn("Starbase in ");\r
-               cramlc(1, game.state.isx, game.state.isy);\r
-               prout(" is under Super-commander attack.");\r
-               proutn("It can hold out until Stardate ");\r
-               cramf(game.future[FSCDBAS], 0, 1);\r
-               prout(".");\r
+               prout("Starbase in %s is under Super-commander attack.",\r
+                     cramlc(quadrant, game.state.isx, game.state.isy));\r
+               prout("It can hold out until Stardate %d.", \r
+                     (int)game.future[FSCDBAS]);\r
        }\r
 }\r
        \r
@@ -88,7 +84,7 @@ void report(int f) {
                        proutn("An armed deep space probe is in");\r
                else\r
                        proutn("A deep space probe is in");\r
-               cramlc(1, probecx, probecy);\r
+               proutn(cramlc(quadrant, probecx, probecy));\r
                prout(".");\r
        }\r
        if (icrystl) {\r
@@ -124,8 +120,7 @@ void lrscan(void) {
                skip(1);\r
                proutn("Long-range scan for");\r
        }\r
-       cramlc(1, quadx, quady);\r
-       skip(1);\r
+       prout(cramlc(quadrant, quadx, quady));\r
        for (x = quadx-1; x <= quadx+1; x++) {\r
                for (y = quady-1; y <= quady+1; y++) {\r
                        if (x == 0 || x > 8 || y == 0 || y > 8)\r
@@ -152,11 +147,10 @@ void dreprt(void) {
                                prout("                IN FLIGHT   DOCKED");\r
                                jdam = TRUE;\r
                        }\r
-                       proutn("  %16s ", device[i]);\r
-                       cramf(game.damage[i]+0.05, 8, 2);\r
-                       proutn("  ");\r
-                       cramf(docfac*game.damage[i]+0.005, 8, 2);\r
-                       skip(1);\r
+                       prout("  %16s %8.2f  %8.2f", \r
+                               device[i],\r
+                               game.damage[i]+0.05,\r
+                               docfac*game.damage[i]+0.005);\r
                }\r
        }\r
        if (!jdam) prout("All devices functional.");\r
@@ -182,9 +176,8 @@ void chart(int nn) {
                                        if (game.starch[i][j] == 1) game.starch[i][j] = game.state.galaxy[i][j]+1000;\r
                }\r
                else {\r
-                       proutn("(Last surveillance update ");\r
-                       cramf(game.state.date-stdamtim, 0, 1);\r
-                       prout(" stardates ago.)");\r
+                   proutn("(Last surveillance update %d stardates ago.",\r
+                          (int)(game.state.date-stdamtim));\r
                }\r
        }\r
        if (nn ==0) skip(1);\r
@@ -209,10 +202,8 @@ void chart(int nn) {
        if (nn == 0) {\r
                skip(1);\r
                crmshp();\r
-               proutn(" is currently in");\r
-               cramlc(1, quadx, quady);\r
-               skip(1);\r
-       }\r
+               prout(" is currently in %s", cramlc(quadrant, quadx, quady));\r
+}\r
 }\r
                \r
                \r
@@ -288,10 +279,10 @@ void srscan(int l) {
                                        proutn(" Condition     %s", cp);\r
                                        break;\r
                                case 3:\r
-                                       proutn(" Position     ");\r
-                                       cramlc(0, quadx, quady);\r
-                                       proutn(",");\r
-                                       cramlc(0, sectx, secty);\r
+                                       proutn(" Position      ");\r
+                                       proutn(cramlc(neither, quadx, quady));\r
+                                       proutn(" , ");\r
+                                       proutn(cramlc(neither, sectx, secty));\r
                                        break;\r
                                case 4:\r
                                        proutn(" Life Support  ");\r
@@ -299,7 +290,7 @@ void srscan(int l) {
                                                if (condit == IHDOCKED)\r
                                                        proutn("DAMAGED, supported by starbase");\r
                                                else\r
-                                                       proutn("DAMAGED, reserves=%4.2f", lsupres);\r
+                                                       proutn("DAMAGED, reserves=%.2f", lsupres);\r
                                        }\r
                                        else\r
                                                proutn("ACTIVE");\r
@@ -447,23 +438,17 @@ void eta(void) {
                }\r
                else\r
                        proutn("Remaining");\r
-               proutn(" energy will be ");\r
-               cramf(energy-tpower, 1, 1);\r
-               prout(".");\r
+               prout(" energy will be %.2f.", energy-tpower);\r
                if (wfl) {\r
-                       proutn("And we will arrive at stardate ");\r
-                       cramf(game.state.date+ttime, 1, 1);\r
-                       prout(".");\r
+                       prout("And we will arrive at stardate %.2f.",\r
+                               game.state.date+ttime);\r
                }\r
                else if (twarp==1.0)\r
                        prout("Any warp speed is adequate.");\r
                else {\r
-                       proutn("Minimum warp needed is ");\r
-                       cramf(twarp, 1, 2);\r
-                       skip(1);\r
-                       proutn("and we will arrive at stardate ");\r
-                       cramf(game.state.date+ttime, 1, 2);\r
-                       prout(".");\r
+                       prout("Minimum warp needed is %.2f,", twarp);\r
+                       prout("and we will arrive at stardate %.2f.",\r
+                               game.state.date+ttime);\r
                }\r
                if (game.state.remtime < ttime)\r
                        prout("Unfortunately, the Federation will be destroyed by then.");\r