One more small merge.

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

diff --git a/planets.c b/planets.c
index aa2982554fb3a445605404c272bfe356b812540e..a9ec295fc76ad3c5affe5975c09632b9a8a6e436 100644 (file)
--- a/planets.c
+++ b/planets.c
@@ -56,11 +56,8 @@ void preport(void) {
 }\r
 \r
 void orbit(void) {\r
-       double asave;\r
-\r
        skip(1);\r
        chew();\r
-       ididit=0;\r
        if (inorbit!=0) {\r
                prout("Already in standard orbit.");\r
                return;\r
@@ -79,7 +76,7 @@ void orbit(void) {
        newcnd();\r
        if (consumeTime()) return;\r
        height = (1400.+7200.*Rand());\r
-       prout("Sulu-  \"Entered orbit at altitude %4.2f kilometers.\"", height);\r
+       prout("Sulu-  \"Entered orbit at altitude %.2f kilometers.\"", height);\r
        inorbit = 1;\r
        return;\r
 }\r
@@ -116,7 +113,7 @@ void beam(void) {
                prout("Transporter damaged.");\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
+                       proutn("Spock-  \"May I suggest the shuttle craft, Sir?\" ");\r
                        if (ja() != 0) shuttle();\r
                }\r
                return;\r
@@ -322,7 +319,7 @@ void shuttle(void) {
                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
+               proutn("Are you sure this is wise?\" ");\r
                if (ja()==0) {\r
                        Time = 0.0;\r
                        return;\r
@@ -412,7 +409,7 @@ void deathray(void) {
        }\r
        prout("Spock-  \"Captain, the 'Experimental Death Ray'");\r
        prout("  is highly unpredictible.  Considering the alternatives,");\r
-       prout("  are you sure this is wise?\" ");\r
+       proutn("  are you sure this is wise?\" ");\r
        if (ja()==0) return;\r
        prout("Spock-  \"Acknowledged.\"");\r
        skip(1);\r