changes newest versions to oldest

[netris.git] / curses.c

diff --git a/curses.c b/curses.c
index e963cce128f580558054dbc7a87c38770f56b9a4..7b5a26d0f3c524a205dd253ab7c79de4f75a1f60 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
@@ -84,14 +84,14 @@ void InitScreens(void)
                        char type;
                        short color;
                } myColorTable[] = {
-                       { BT_white,   COLOR_WHITE },
-                       { BT_blue,    COLOR_BLUE },
-                       { BT_magenta, COLOR_MAGENTA },
-                       { BT_cyan,    COLOR_CYAN },
-                       { BT_yellow,  COLOR_YELLOW },
-                       { BT_green,   COLOR_GREEN },
-                       { BT_red,     COLOR_RED },
-                       { BT_none,    0 }
+                       { BT_T, COLOR_WHITE },
+                       { BT_I, COLOR_BLUE },
+                       { BT_O, COLOR_MAGENTA },
+                       { BT_L, COLOR_CYAN },
+                       { BT_J, COLOR_YELLOW },
+                       { BT_S, COLOR_GREEN },
+                       { BT_Z, COLOR_RED },
+                       { BT_none, 0 }
                }; //myColorTable
                int i = 0;
 
@@ -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,13 +210,15 @@ void DrawTitle(void)
        standout();
 #endif
        getmaxyx(stdscr, rows, cols);
-       sprintf(s, " NETRIS %s", version_string);
-       memset(&s[strlen(s)], ' ', 254 - strlen(s));
-       if (cols > 56 + strlen(version_string))
-               memcpy(&s[cols - 48],
-                       "(C)1994-1996,1999 Mark H. Weaver, (C)2002 Shiar \0", 49);
-       else memcpy(&s[cols], "\0", 1);
+       s = malloc(cols + 1);
+       sprintf(s, " " MSG_TITLE " %s", version_string);
+       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
 }
 
@@ -335,10 +337,6 @@ void InitFields(void)
                DrawField(scr);
 }
 
-void CleanupScreen(int scr)
-{
-}
-
 void DisplayMessage(char *p)
 {
        char s[MSG_WIDTH];