printfs have been banished. All outputnow goes through prout/proutn/prouts.

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

diff --git a/moving.c b/moving.c
index 0b9ecbed686f32c5b5997607e835ec29fc4fe9dc..d1f5bafaea108c1396b6d5fd2ae2b539ab3f34f2 100644 (file)
--- a/moving.c
+++ b/moving.c
@@ -500,10 +500,11 @@ void warp(int i) {
                                        prout("We can't do it, Captain. We haven't the energy.");\r
                                }\r
                                else {\r
-                                       proutn("We haven't the energy, but we could do it at warp ");\r
-                                       crami(iwarp, 1);\r
-                                       if (shldup)\r
-                                               prout(",\nif you'll lower the shields.");\r
+                                       proutn("We haven't the energy, but we could do it at warp %d", iwarp);\r
+                                       if (shldup) {\r
+                                               prout(",");\r
+                                               prout("if you'll lower the shields.");\r
+                                       }\r
                                        else\r
                                                prout(".");\r
                                }\r
@@ -837,8 +838,7 @@ void probe(void) {
 \r
        if (key == IHEOL) {\r
                /* slow mode, so let Kirk know how many probes there are left */\r
-               crami(nprobes,1);\r
-               prout(nprobes==1 ? " probe left." : " probes left.");\r
+               prout(nprobes==1 ? "%d probe left." : "%d probes left.", nprobes);\r
                proutn("Are you sure you want to fire a probe? ");\r
                if (ja()==0) return;\r
        }\r