X-Git-Url: http://git.shiar.nl/netris.git/blobdiff_plain/e799b9a7fe08744f8c99557a067ecb442860b69c..7add4dc35888082cd4c77444dc72b9cfa1e6ec7f:/curses.c

diff --git a/curses.c b/curses.c
index 11fac6e..2c4b87c 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);
@@ -293,7 +293,7 @@ void InitFields(void)
 	messageWidth  = MIN(x - messageXPos - 2, MSG_WIDTH);
 	messageHeight = MIN(y - messageYPos - 1, MSG_HEIGHT);
 	if (messageHeight <= 0) {
-		messageWidth = 27;
+		messageWidth = MIN(x - statusXPos - 18, 27);
 		messageHeight = y - 3;
 		messageXPos = statusXPos + 16;
 		messageYPos = 2;
@@ -337,10 +337,6 @@ void InitFields(void)
 		DrawField(scr);
 }
 
-void CleanupScreen(int scr)
-{
-}
-
 void DisplayMessage(char *p)
 {
 	char s[MSG_WIDTH];