X-Git-Url: http://git.shiar.net/netris.git/blobdiff_plain/368e88e0239eb53ee80287d8c298ed401622781e..b3738f1f2b079c7eb910051bdca26e54b5f3e592:/curses.c

diff --git a/curses.c b/curses.c
index 637e897..5a90d21 100644
--- a/curses.c
+++ b/curses.c
@@ -29,7 +29,7 @@
 #include "curses.h"
 #include "util.h"
 #include "board.h"
-#include "msg.en.h"
+#include "msg.h"
 
 #ifdef NCURSES_VERSION
 # define HAVE_NCURSES
@@ -213,7 +213,7 @@ void DrawTitle(void)
 	s = malloc(cols + 1);
 	sprintf(s, " " MSG_TITLE " %s", version_string);
 	const int titlelen = strlen(s);
-	memset(&s[titlelen], ' ', cols - strlen(MSG_TITLE)); // pad
+	memset(&s[titlelen], ' ', cols - titlelen); // pad
 	if (cols > titlelen + 1 + strlen(MSG_TITLESUB))
 		memcpy(&s[cols - 1 - strlen(MSG_TITLESUB)], MSG_TITLESUB, sizeof(MSG_TITLESUB) - 1);
 	memcpy(&s[cols], "\0", 1);
@@ -292,8 +292,8 @@ void InitFields(void)
 	messageYPos = 24;
 	messageWidth  = MIN(x - messageXPos - 2, MSG_WIDTH);
 	messageHeight = MIN(y - messageYPos - 1, MSG_HEIGHT);
-	if (messageHeight <= 0) {
-		messageWidth = 27;
+	if (messageHeight < 3) {
+		messageWidth = MIN(x - statusXPos - 18, 27);
 		messageHeight = y - 3;
 		messageXPos = statusXPos + 16;
 		messageYPos = 2;