Clean up some float formatting.

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

diff --git a/planets.c b/planets.c
index b95761f0e48dfb3fdeec94efcd16e9476c741cbc..a45879f05c8adf225ea236fec6150810117b8eb2 100644 (file)
--- a/planets.c
+++ b/planets.c
@@ -1,8 +1,9 @@
 #include "sst.h"\r
 \r
-static char classes[4][2]={"","M","N","O"};\r
 static int height;\r
 \r
+static char *classes[] = {"M","N","O"};\r
+\r
 static int consumeTime(void) {\r
 /* I think most of this avoidance was caused by overlay scheme.\r
    Let's see what happens if all events can occur here */\r
@@ -31,23 +32,23 @@ void preport(void) {
        chew();\r
        prout("Spock-  \"Planet report follows, Captain.\"");\r
        skip(1);\r
-       for (i = 1; i <= inplan; i++) {\r
-               if (game.state.plnets[i].known\r
+       for (i = 0; i < inplan; i++) {\r
+               if (game.state.plnets[i].known != unknown\r
 #ifdef DEBUG\r
                        || ( idebug && game.state.plnets[i].x !=0)\r
 #endif\r
                        ) {\r
                        iknow = 1;\r
 #ifdef DEBUG\r
-                       if (idebug && game.state.plnets[i].known==0) proutn("(Unknown) ");\r
+                       if (idebug && game.state.plnets[i].known==unknown) proutn("(Unknown) ");\r
 #endif\r
-                       cramlc(1, game.state.plnets[i].x, game.state.plnets[i].y);\r
+                       proutn(cramlc(quadrant, game.state.plnets[i].x, game.state.plnets[i].y));\r
                        proutn("   class ");\r
                        proutn(classes[game.state.plnets[i].pclass]);\r
                        proutn("   ");\r
                        if (game.state.plnets[i].crystals == 0) proutn("no ");\r
                        prout("dilithium crystals present.");\r
-                       if (game.state.plnets[i].known==2) \r
+                       if (game.state.plnets[i].known==shuttle_down) \r
                                prout("    Shuttle Craft Galileo on surface.");\r
                }\r
        }\r
@@ -77,9 +78,8 @@ void orbit(void) {
        prout("Helmsman Sulu-  \"Entering standard orbit, Sir.\"");\r
        newcnd();\r
        if (consumeTime()) return;\r
-       proutn("Sulu-  \"Entered orbit at altitude ");\r
-       cramf(height = (1400.+7200.*Rand()), 0, 2);\r
-       prout(" kilometers.\"");\r
+       height = (1400.+7200.*Rand());\r
+       prout("Sulu-  \"Entered orbit at altitude %.2f kilometers.\"", height);\r
        inorbit = 1;\r
        return;\r
 }\r
@@ -95,21 +95,17 @@ void sensor(void) {
                prout("No planet in this quadrant.");\r
                return;\r
        }\r
-       proutn("Spock-  \"Sensor scan for");\r
-       cramlc(1, quadx, quady);\r
-       prout("-");\r
+       prout("Spock-  \"Sensor scan for %s-", cramlc(quadrant, quadx, quady));\r
        skip(1);\r
-       proutn("         Planet at");\r
-       cramlc(2, plnetx, plnety);\r
-       proutn(" is of class ");\r
-       proutn(classes[game.state.plnets[iplnet].pclass]);\r
-       prout(".");\r
-       if (game.state.plnets[iplnet].known==2) \r
+       prout("         Planet at %s is of class %s.", \r
+              cramlc(sector, plnetx, plnety),\r
+              classes[game.state.plnets[iplnet].pclass]);\r
+       if (game.state.plnets[iplnet].known==shuttle_down) \r
                prout("         Sensors show Galileo still on surface.");\r
        proutn("         Readings indicate");\r
        if (game.state.plnets[iplnet].crystals == 0) proutn(" no");\r
        prout(" dilithium crystals present.\"");\r
-       if (game.state.plnets[iplnet].known == 0) game.state.plnets[iplnet].known = 1;\r
+       if (game.state.plnets[iplnet].known == unknown) game.state.plnets[iplnet].known = known;\r
        return;\r
 }\r
 \r
@@ -118,7 +114,7 @@ void beam(void) {
        skip(1);\r
        if (game.damage[DTRANSP] != 0) {\r
                prout("Transporter damaged.");\r
-               if (game.damage[DSHUTTL]==0 && (game.state.plnets[iplnet].known==2 || iscraft == 1)) {\r
+               if (game.damage[DSHUTTL]==0 && (game.state.plnets[iplnet].known==shuttle_down || iscraft == 1)) {\r
                        skip(1);\r
                        prout("Spock-  \"May I suggest the shuttle craft, Sir?\" ");\r
                        if (ja() != 0) shuttle();\r
@@ -134,7 +130,7 @@ void beam(void) {
                prout("Impossible to transport through shields.");\r
                return;\r
        }\r
-       if (game.state.plnets[iplnet].known==0) {\r
+       if (game.state.plnets[iplnet].known==unknown) {\r
                prout("Spock-  \"Captain, we have no information on this planet");\r
                prout("  and Starfleet Regulations clearly state that in this situation");\r
                prout("  you may not go down.\"");\r
@@ -142,7 +138,7 @@ void beam(void) {
        }\r
        if (landed==1) {\r
                /* Coming from planet */\r
-               if (game.state.plnets[iplnet].known==2) {\r
+               if (game.state.plnets[iplnet].known==shuttle_down) {\r
                        proutn("Spock-  \"Wouldn't you rather take the Galileo?\" ");\r
                        if (ja() != 0) {\r
                                chew();\r
@@ -188,7 +184,7 @@ void beam(void) {
        skip(2);\r
        prout("Transport complete.");\r
        landed = -landed;\r
-       if (landed==1 && game.state.plnets[iplnet].known==2) {\r
+       if (landed==1 && game.state.plnets[iplnet].known==shuttle_down) {\r
                prout("The shuttle craft Galileo is here!");\r
        }\r
        if (landed!=1 && imine==1) {\r
@@ -287,7 +283,7 @@ void shuttle(void) {
        ididit = 0;\r
        if(game.damage[DSHUTTL] != 0.0) {\r
                if (game.damage[DSHUTTL] == -1.0) {\r
-                       if (inorbit && game.state.plnets[iplnet].known == 2)\r
+                       if (inorbit && game.state.plnets[iplnet].known == shuttle_down)\r
                                prout("Ye Faerie Queene has no shuttle craft bay to dock it at.");\r
                        else\r
                                prout("Ye Faerie Queene had no shuttle craft.");\r
@@ -302,11 +298,11 @@ void shuttle(void) {
                prout(" not in standard orbit.");\r
                return;\r
        }\r
-       if ((game.state.plnets[iplnet].known != 2) && iscraft != 1) {\r
+       if ((game.state.plnets[iplnet].known != shuttle_down) && iscraft != 1) {\r
                prout("Shuttle craft not currently available.");\r
                return;\r
        }\r
-       if (landed==-1 && game.state.plnets[iplnet].known==2) {\r
+       if (landed==-1 && game.state.plnets[iplnet].known==shuttle_down) {\r
                prout("You will have to beam down to retrieve the shuttle craft.");\r
                return;\r
        }\r
@@ -314,7 +310,7 @@ void shuttle(void) {
                prout("Shuttle craft cannot pass through shields.");\r
                return;\r
        }\r
-       if (game.state.plnets[iplnet].known==0) {\r
+       if (game.state.plnets[iplnet].known==unknown) {\r
                prout("Spock-  \"Captain, we have no information on this planet");\r
                prout("  and Starfleet Regulations clearly state that in this situation");\r
                prout("  you may not fly down.\"");\r
@@ -323,9 +319,8 @@ void shuttle(void) {
        Time = 3.0e-5*height;\r
        if (Time >= 0.8*game.state.remtime) {\r
                prout("First Officer Spock-  \"Captain, I compute that such");\r
-               prout("  a maneuver would require approximately ");\r
-               cramf(100*Time/game.state.remtime,0,4);\r
-               prout("% of our");\r
+               proutn("  a maneuver would require approximately 2d%% of our",\r
+                     (int)(100*Time/game.state.remtime));\r
                prout("remaining time.");\r
                prout("Are you sure this is wise?\" ");\r
                if (ja()==0) {\r
@@ -351,7 +346,7 @@ void shuttle(void) {
                        iscraft = 0;\r
                        skip(1);\r
                        if (consumeTime()) return;\r
-                       game.state.plnets[iplnet].known=2;\r
+                       game.state.plnets[iplnet].known=shuttle_down;\r
                        prout("Trip complete.");\r
                        return;\r
                }\r
@@ -361,7 +356,7 @@ void shuttle(void) {
                        prout("shuttle craft for the trip back to the Enterprise.");\r
                        skip(1);\r
                        prout("The short hop begins . . .");\r
-                       game.state.plnets[iplnet].known=1;\r
+                       game.state.plnets[iplnet].known=known;\r
                        icraft = 1;\r
                        skip(1);\r
                        landed = -1;\r
@@ -388,7 +383,7 @@ void shuttle(void) {
                icraft = 1;\r
                iscraft = 0;\r
                if (consumeTime()) return;\r
-               game.state.plnets[iplnet].known = 2;\r
+               game.state.plnets[iplnet].known = shuttle_down;\r
                landed = 1;\r
                icraft = 0;\r
                prout("Trip complete");\r
@@ -445,7 +440,7 @@ void deathray(void) {
                        prout("   is still operational.\"");\r
                }\r
                else {\r
-                       prout("   has been rendered disfunctional.\"");\r
+                       prout("   has been rendered nonfunctional.\"");\r
                        game.damage[DDRAY] = 39.95;\r
                }\r
                return;\r