One more small merge.
[super-star-trek.git] / planets.c
index eed32104fea1cccc1cdbe509124fdc1e3a809730..a9ec295fc76ad3c5affe5975c09632b9a8a6e436 100644 (file)
--- a/planets.c
+++ b/planets.c
@@ -58,7 +58,6 @@ void preport(void) {
 void orbit(void) {\r
        skip(1);\r
        chew();\r
-       ididit=0;\r
        if (inorbit!=0) {\r
                prout("Already in standard orbit.");\r
                return;\r
@@ -114,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