From ca19525727deffe6ea0012d35168d9942baa3958 Mon Sep 17 00:00:00 2001
From: "Eric S. Raymond" <esr@thyrsus.com>
Date: Thu, 14 Apr 2005 14:11:10 +0000
Subject: [PATCH] Stas's change to get rid of unwanted EOLs.

---
 TODO      | 2 +-
 io.c      | 2 +-
 reports.c | 9 ++++-----
 setup.c   | 8 +++++---
 sst.c     | 7 ++++++-
 5 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/TODO b/TODO
index ee7251f..69139ff 100644
--- a/TODO
+++ b/TODO
@@ -5,4 +5,4 @@
   non-"super" version Matuszek and Reynolds wrote.)
 
 * Code to hurl you out of quadrant if a supernova occurs as you warp in 
-  seems to hang.
+  seems to hang.  One bad case is when you get stopped by a star.
diff --git a/io.c b/io.c
index d341842..fd50f61 100644
--- a/io.c
+++ b/io.c
@@ -121,7 +121,7 @@ void skip(int i)
 {
     while (i-- > 0) {
 	if (game.options & OPTION_CURSES) {
-	    proutn("\n\r");
+	    proutn("\n");
 	} else {
 	    linecount++;
 	    if (linecount >= rows)
diff --git a/reports.c b/reports.c
index f169c15..c437326 100644
--- a/reports.c
+++ b/reports.c
@@ -194,11 +194,11 @@ void chart(int nn)
 	rechart();
 
     if (lastchart < game.state.date && condit == IHDOCKED) {
-	proutn("Spock-  \"I revised the Star Chart from the starbase's records.\"\n");
+	prout("Spock-  \"I revised the Star Chart from the starbase's records.\"");
 	rechart();
     }
 
-    if (nn == 0) proutn("       STAR CHART FOR THE KNOWN GALAXY\n");
+    if (nn == 0) prout("       STAR CHART FOR THE KNOWN GALAXY");
     if (game.state.date > lastchart)
 	prout("(Last surveillance update %d stardates ago).",
 	      (int)(game.state.date-lastchart));
@@ -226,9 +226,8 @@ void chart(int nn)
 		proutn(" ");
 	}
 	proutn("  |");
-	if (i<GALSIZE) proutn("\n");
+	if (i<GALSIZE) skip(1);
     }
-    prout("");	/* flush output */
 }
 
 static void sectscan(int goodScan, int i, int j) 
@@ -384,7 +383,7 @@ int srscan(int l)
 	}
 	if (rightside)
 	    status(jj);
-	if (i<sizeof(requests)/sizeof(requests[0])) proutn("\n");
+	if (i<sizeof(requests)/sizeof(requests[0])) skip(1);
 	if (req!=0) return(goodScan);
     }
     prout("");
diff --git a/setup.c b/setup.c
index d729c61..6ea71b5 100644
--- a/setup.c
+++ b/setup.c
@@ -264,13 +264,13 @@ void setup(int needprompt)
 		if (distq < 6.0*(BASEMAX+1-inbase) && Rand() < 0.75) {
 		    contflag = TRUE;
 #ifdef DEBUG
-		    proutn("DEBUG: Abandoning base #%d at %d-%d\n", i, ix, iy);
+		    prout("DEBUG: Abandoning base #%d at %d-%d", i, ix, iy);
 #endif
 		    break;
 		}
 #ifdef DEBUG
 		else if (distq < 6.0 * (BASEMAX+1-inbase)) {
-		    proutn("DEBUG: saving base #%d, close to #%d\n", i, j);
+		    prout("DEBUG: saving base #%d, close to #%d", i, j);
 		}
 #endif
 	    }
@@ -290,7 +290,9 @@ void setup(int needprompt)
 	int klump = (1.0 - r*r)*klumper;
 	if (klump > krem) klump = krem;
 	krem -= klump;
-	do iran(GALSIZE,&ix,&iy); while (game.state.galaxy[ix][iy].supernova);
+	do iran(GALSIZE,&ix,&iy);
+	while (game.state.galaxy[ix][iy].supernova ||
+		game.state.galaxy[ix][iy].klingons + klump > 9);
 	game.state.galaxy[ix][iy].klingons += klump;
     } while (krem > 0);
     // Position Klingon Commander Ships
diff --git a/sst.c b/sst.c
index 2d454cb..1d4ca2f 100644
--- a/sst.c
+++ b/sst.c
@@ -82,7 +82,7 @@ Here are Stas Sergeev's changes:
       chasing SCom can take an eternity).
 
    5. Probe target you enter is now the destination quadrant. Before I don't 
-      remember what it was, but it was something I had difficulty using)
+      remember what it was, but it was something I had difficulty using.
 
    6. Secret password is now autogenerated.
 
@@ -797,5 +797,10 @@ void debugme(void)
 	}
 	chew();
     }
+    proutn("Induce supernova here? ");
+    if (ja() != 0) {
+	game.state.galaxy[quadx][quady].supernova = TRUE;
+	atover(1);
+    }
 }
 #endif
-- 
2.31.1