non-exclusive instadrop and soft drop

[netris.git] / curses.c

diff --git a/curses.c b/curses.c
index 637e8971721f97836f6cfcd826a9baa23de2921f..5a90d2125fb189637d1b5a1b0b6a34fbf0f72e63 100644 (file)
--- 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;