From: Stas P <stas@stas.(none)>
Date: Tue, 14 Dec 2010 15:02:16 +0000 (+0300)
Subject: avoid trailing newlines to cause scroll-pausing.
X-Git-Tag: 2.2~115^2~7
X-Git-Url: https://jxself.org/git/?a=commitdiff_plain;h=a404eb642e74b97233fa0f84b95a0601a86b5b66;p=super-star-trek.git

avoid trailing newlines to cause scroll-pausing.
---

diff --git a/sst.py b/sst.py
index 966795c..94f8103 100755
--- a/sst.py
+++ b/sst.py
@@ -3161,16 +3161,11 @@ def skip(i):
     "Skip i lines.  Pause game if this would cause a scrolling event."
     for dummy in range(i):
 	if game.options & OPTION_CURSES:
-            (y, x) = curwnd.getyx()
-            (my, mx) = curwnd.getmaxyx()
-	    if curwnd == message_window and y >= my - 2:
-		pause_game()
-		clrscr()
-	    else:
-                try:
-                    curwnd.move(y+1, 0)
-                except curses.error:
-                    pass
+	    (y, x) = curwnd.getyx()
+	    try:
+		curwnd.move(y+1, 0)
+	    except curses.error:
+		pass
 	else:
             global linecount
 	    linecount += 1
@@ -3182,6 +3177,11 @@ def skip(i):
 def proutn(line):
     "Utter a line with no following line feed."
     if game.options & OPTION_CURSES:
+	(y, x) = curwnd.getyx()
+	(my, mx) = curwnd.getmaxyx()
+	if curwnd == message_window and y >= my - 2:
+	    pause_game()
+	    clrscr()
 	curwnd.addstr(line)
 	curwnd.refresh()
     else: