From: P. F. Chimento <philip.chimento@gmail.com>
Date: Sun, 17 Apr 2011 10:18:04 +0000 (+0200)
Subject: Update Gargoyle interpreters to r548
X-Git-Tag: v0.9~108
X-Git-Url: https://git.stderr.nl/gitweb?a=commitdiff_plain;h=8027cc877937e4a65dd4e383be7fe2502dd56b90;p=projects%2Fchimara%2Fchimara.git

Update Gargoyle interpreters to r548

Frotz was the only interpreter with changes.
---

diff --git a/interpreters/frotz/glkscreen.c b/interpreters/frotz/glkscreen.c
index f7c8e08..079373b 100644
--- a/interpreters/frotz/glkscreen.c
+++ b/interpreters/frotz/glkscreen.c
@@ -263,8 +263,6 @@ void smartstatusline (void)
 	int roomlen, scorelen, scoreofs;
 	int len, tmp;
 
-	statusline[curx - 1] = 0; /* terminate! */
-
 	packspaces(statusline, packed);
 	//strcpy(packed, statusline);
 	len = os_string_length(packed);
@@ -351,22 +349,38 @@ void screen_char (zchar c)
 		else {
 			if (cury == 1)
 			{
-				if (curx < sizeof statusline)
+				if (curx <= ((sizeof statusline / sizeof(zchar)) - 1))
+				{
 					statusline[curx - 1] = c;
-				curx++;
-				if (curx <= h_screen_cols)
+					statusline[curx] = 0;
+				}
+				if (curx < h_screen_cols)
+				{
 					glk_put_char_uni(c);
+				}
+				else if (curx == h_screen_cols)
+				{
+					glk_put_char_uni(c);
+					glk_window_move_cursor(gos_curwin, curx-1, cury-1);
+				}
 				else
+				{
 					smartstatusline();
+				}
+				curx ++;
 			}
 			else
 			{
-				glk_put_char_uni(c);
-				curx++;
-				if (curx > h_screen_cols) {
-					curx = 1;
-					cury++;
+				if (curx < h_screen_cols)
+				{
+					glk_put_char_uni(c);
 				}
+				else if (curx == (h_screen_cols))
+				{
+					glk_put_char_uni(c);
+					glk_window_move_cursor(gos_curwin, curx-1, cury-1);
+				}
+				curx++;
 			}
 		}
 	}