X-Git-Url: http://git.shiar.net/netris.git/blobdiff_plain/c464ec173a4931ee5bdea783324b159492abd866..cc18d725f485013b9be8bb16f3a93e5eef12d5c1:/curses.c diff --git a/curses.c b/curses.c index bb3834e..7b5a26d 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 @@ -202,7 +202,7 @@ void OutputTermStr(char *str, int flush) void DrawTitle(void) { int rows, cols; - char s[255]; + char *s; #ifdef HAVE_NCURSES attrset(A_REVERSE); @@ -210,12 +210,15 @@ void DrawTitle(void) standout(); #endif getmaxyx(stdscr, rows, cols); + s = malloc(cols + 1); sprintf(s, " " MSG_TITLE " %s", version_string); - memset(&s[strlen(s)], ' ', 254 - strlen(s)); - if (cols > strlen(MSG_TITLE) + 2 + strlen(version_string) + 1 + strlen(MSG_TITLESUB)) + const int titlelen = strlen(s); + memset(&s[titlelen], ' ', cols - strlen(MSG_TITLE)); // 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); mvaddstr(0, 0, s); + free(s); standend(); //normal text } @@ -334,10 +337,6 @@ void InitFields(void) DrawField(scr); } -void CleanupScreen(int scr) -{ -} - void DisplayMessage(char *p) { char s[MSG_WIDTH];