From: Laurent Mazet <mazet@softndesign.org>
Date: Wed, 18 Sep 2024 20:07:47 +0000 (+0200)
Subject: message cleaning
X-Git-Tag: v1.4~1
X-Git-Url: https://secure.softndesign.org/git/?a=commitdiff_plain;h=9bb4a01b48cd7ab6a18f3d2de83947c3e8fdd2b9;p=tetris.git

message cleaning
---

diff --git a/display.c b/display.c
index e82fbf2..3e70951 100644
--- a/display.c
+++ b/display.c
@@ -297,7 +297,7 @@ void msgwindow (char *msg, int xoffset, int yoffset, int length)
 
 void msg2window (char *msg, int xoffset, int yoffset)
 {
-    int length = strlen (msg) + 2;
+    int length = strlen (msg);
     xoffset -= length / 2;
     msgwindow (msg, xoffset, yoffset, length);
 }
diff --git a/oneplayer.c b/oneplayer.c
index ea5b619..cc1b2e7 100644
--- a/oneplayer.c
+++ b/oneplayer.c
@@ -38,7 +38,6 @@ int oneplayer (int width, int height, int scale, int wide, int chrono, char *fil
     int score = 0;
 
     /* read file */
-    int whelp = strmaxlen (help, '\n');
     if (filename) {
         char *buffer = readdata (filename);
         if (buffer == NULL) {
@@ -96,7 +95,6 @@ int oneplayer (int width, int height, int scale, int wide, int chrono, char *fil
     int yboard = board->yoffset = yoffset + 1 + (wide ? 2 : 0);
     int xscore = xboard + 2 + (wide ? -1 : xoffset + board->xsize);
     int yscore = yboard - (wide ? 3 : 0);
-    int wscore = (wide ? 16 : whelp - 2);
     nextblock->xoffset = xscore + (9 + nbdigit + 1 - nextblock->xsize) / 2;
     int ynext = nextblock->yoffset = yscore + 1 + 2 + yoffset;
     int xhelp = (wide ? xboard + (board->xsize - 1) / 2 : xscore - 1);
@@ -113,7 +111,7 @@ int oneplayer (int width, int height, int scale, int wide, int chrono, char *fil
     }
 
     /* window positions (msg) */
-    int lmsg = (wide ? 24 : whelp - 2);
+    int lmsg = (wide ? 24 : board->xsize);
     int xmsg = (wide ? xboard + board->xsize - lmsg - 1 : xboard);
     int ymsg = (wide ? yboard + board->ysize + 1 : yhelp + lhelp + 1 + xoffset);
 
@@ -136,7 +134,7 @@ int oneplayer (int width, int height, int scale, int wide, int chrono, char *fil
                 boardwindow (nextblock, 1);
                 displayblock (nextblock, blocks + current, -1, -1);
             }
-            sprintf (msg, "Get ready player One");
+            sprintf (msg, "Get ready player");
             sprintf (msg2, "Press <s> to start");
             break;
         case 0:
@@ -145,7 +143,7 @@ int oneplayer (int width, int height, int scale, int wide, int chrono, char *fil
                 displayblock (nextblock, blocks + current, -1, -1);
             }
             sprintf (msg, "Game in pause");
-            sprintf (msg2, "Pause <p> to continue");
+            sprintf (msg2, "Press <p> to play");
             break;
         case 1:
             halfdelay (1);
diff --git a/twoplayers.c b/twoplayers.c
index 7a5a503..a6a8d07 100644
--- a/twoplayers.c
+++ b/twoplayers.c
@@ -109,7 +109,7 @@ int twoplayers (int width, int height, int scale)
         case 0:
             boardwindow (nextblock, 1);
             //displayblock (nextblock, blocks + current, -1, -1);
-            sprintf (msg, "Game in pause. Pause <p> to continue");
+            sprintf (msg, "Game in pause. Press <p> to play");
             break;
         case 1:
             halfdelay (1);