Remove CRs.

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

diff --git a/finish.c b/finish.c
index b19ce7f14242a9d30c9c8f405bcfe94a527e2ab0..e3ace26732e2fef5cb47715c2ab18ef5d1723374 100644 (file)
--- a/finish.c
+++ b/finish.c
@@ -1,6 +1,3 @@
-#ifdef SERGEEV
-#include <conio.h>
-#endif /* SERGEEV */
 #include "sst.h"
 #include <string.h>
 #include <time.h>
@@ -19,21 +16,13 @@ void dstrct() {
        prouts("          8"); skip(1);
        prouts("             7"); skip(1);
        prouts("                6"); skip(1);
-#ifdef SERGEEV
        skip(1);
-#endif /* SERGEEV */
        prout("ENTER-CORRECT-PASSWORD-TO-CONTINUE-");
-#ifdef SERGEEV
        skip(1);
-#endif /* SERGEEV */
        prout("SELF-DESTRUCT-SEQUENCE-OTHERWISE-");
-#ifdef SERGEEV
        skip(1);
-#endif /* SERGEEV */
        prout("SELF-DESTRUCT-SEQUENCE-WILL-BE-ABORTED");
-#ifdef SERGEEV
        skip(1);
-#endif /* SERGEEV */
        scan();
        chew();
        if (strcmp(game.passwd, citem) != 0) {
@@ -403,14 +392,8 @@ void plaque(void) {
        skip(2);
        
        while (fp == NULL) {
-#ifdef SERGEEV
                 proutn("File or device name for your plaque: ");
-                getline(winner, sizeof(winner));
-#else
-               proutn("File or device name for your plaque:");
-               fgets(winner, 128, stdin);
-               winner[strlen(winner)-1] = '\0';
-#endif /* SERGEEV */
+                cgetline(winner, sizeof(winner));
                fp = fopen(winner, "w");
                if (fp==NULL) {
                         prout("Invalid name.");
@@ -418,15 +401,9 @@ void plaque(void) {
        }
 
         proutn("Enter name to go on plaque (up to 30 characters): ");
-        getline(winner, sizeof(winner));
-        proutn("Enter name to go on plaque (up to 30 characters): ");
-        getline(winner, sizeof(winner));
-       winner[30] = '\0';
-#ifdef SERGEEV
+        cgetline(winner, sizeof(winner));
+       /* The 38 below must be 64 for 132-column paper */
        nskip = 38 - strlen(winner)/2;
-#else
-       nskip = 64 - strlen(winner)/2;
-#endif /* SERGEEV */
 
        fprintf(fp,"\n\n\n\n");
        /* --------DRAW ENTERPRISE PICTURE. */