all in-game messages in include

diff --git a/client.c b/client.c
index 38386213551e383e28570f7e3e89199e1c953902..1555e64e235c9399ff7eefa18c21cc5f98c8a176 100644 (file)
--- a/client.c
+++ b/client.c
@@ -304,12 +304,12 @@ static void game_clear(int scr)
                                        junkLines = linesCleared - (Game.gravity ? 1 : linesCleared < 4);
                                        data[0] = junkLines;
                                        SendPacket(me, NP_giveJunk, sizeof(data), data);
-                                       msg_add("\\%dYou send %d lines",
+                                       msg_add("\\%d" MSG_GAME_LINES_SELF,
                                                Players[me].team > 7 ? 7 : Players[me].team, junkLines);
                                } //send junk to others
                        } //multiplayer
                        else {
-                               msg_add("\\%dYou cleared %d lines",
+                               msg_add("\\%d" MSG_GAME_LINE_SELF,
                                        Players[me].team > 7 ? 7 : Players[me].team, linesCleared);
                        } //singleplayer
                } //IT'S YOU
@@ -336,10 +336,10 @@ static void game_loop(void)
                        Players[me].flags ^= SCF_paused;
                        if (Game.started > 1)
                                msg_add(Players[me].flags & SCF_paused
-                                       ? "You paused the game" : "You unpaused the game");
+                                       ? MSG_GAME_PAUSE_SELF : MSG_GAME_UNPAUSE_SELF);
                        else
                                msg_add(Players[me].flags & SCF_paused
-                                       ? "You are not ready" : "You are ready");
+                                       ? MSG_GAME_UNREADY_SELF : MSG_GAME_READY_SELF);
                        game_setpaused();
                        if (Game.type == GT_classicTwo)
                                SendPacket(me, NP_pause, 0, NULL);
@@ -365,7 +365,7 @@ static void game_loop(void)
                                return handle_cmd(i, cmdend + 1);
                        }
                }
-               msg_add("Unknown command /%s", cmd);
+               msg_add(MSG_CMD_EUNKNOWN, cmd);
        }
 
        void handle_str(char *str)
@@ -534,7 +534,7 @@ static void game_loop(void)
                        if (Players[me].alive <= 0) break;
                        memcpy(data, net.data, sizeof(data[0]));
                        column = Random(0, Players[me].boardWidth);
-                       msg_add("\\%d%s sends %d lines",
+                       msg_add("\\%d" MSG_GAME_LINES,
                                Players[net.uid].team > 7 ? 7 : Players[net.uid].team,
                                Players[net.uid].name, data[0]);
                        lastadd = net.uid;
@@ -559,7 +559,7 @@ static void game_loop(void)
 
                        Game.started = 2;
                        paused = 0;
-                       msg_add("The game has started");
+                       msg_add(MSG_GAME_START);
                        for (i = 1; i < MAX_SCREENS; i++) if (Players[i].alive > 0)
                                window_msg_status(i);
                        break;
@@ -571,7 +571,7 @@ static void game_loop(void)
                                float timer;
                                int i;
 
-                               msg_add("The game has ended");
+                               msg_add(MSG_GAME_STOP);
                                timer = CurTimeval() / 1e6;
                                if (timer > 5) {
                                        for (i = MAX_SCREENS-1; i > 0; i--) if (Players[i].alive >= 0) {
@@ -582,7 +582,7 @@ static void game_loop(void)
                                                if (Players[i].alive > 0) winner = i;
                                        } //show player stats
                                if (winner)
-                                       msg_add("%s won after %0.0f'%02d\"",
+                                       msg_add(MSG_GAME_WINNER,
                                                Players[winner].name, timer / 60, (int)timer % 60);
                                } //show game stats
                                msg_add(NULL);
@@ -612,9 +612,9 @@ static void game_loop(void)
                        player_empty(net.uid);
                        screen_setup();
                        if (Players[net.uid].team > 7)
-                               msg_add("%s joined the game", Players[net.uid].name);
+                               msg_add(MSG_GAME_JOIN, Players[net.uid].name);
                        else
-                               msg_add("%s joined %s team", Players[net.uid].name,
+                               msg_add(MSG_GAME_JOIN_TEAM, Players[net.uid].name,
                                        teamname[Players[net.uid].team]);
                        if (Players[net.uid].flags & SCF_paused) {
                                game_setpaused();
@@ -631,11 +631,11 @@ static void game_loop(void)
                        Players[net.uid].flags ^= SCF_paused;
                        if (Game.started > 1)
                                strcpy(s, Players[net.uid].flags&SCF_paused
-                                       ? "paused the game" : "unpaused the game");
+                                       ? MSG_GAME_PAUSE : MSG_GAME_UNPAUSE);
                        else
                                strcpy(s, Players[net.uid].flags&SCF_paused
-                                       ? "is not ready" : "is ready");
-                       msg_add("%s %s", Players[net.uid].name, s);
+                                       ? MSG_GAME_UNREADY : MSG_GAME_READY);
+                       msg_add(s, Players[net.uid].name);
                        game_setpaused();
                        window_msg_status(net.uid);
                        changed = 1;
@@ -646,7 +646,7 @@ static void game_loop(void)
                        game_setpaused();
                        oldPaused = 0;
                        Players[net.uid].alive = -1;
-                       msg_add("%s left", Players[net.uid].name);
+                       msg_add(MSG_GAME_PART, Players[net.uid].name);
                        game_setpaused();
                        window_msg_status(net.uid);
                        changed = 1;
@@ -657,13 +657,13 @@ static void game_loop(void)
                        memcpy(&i, net.data, sizeof(i));
                        Players[net.uid].alive = 0;
                        if (i == me)
-                               msg_add("\\%dYou fragged %s",
+                               msg_add("\\%d" MSG_GAME_KILL_1_2,
                                        Players[me].team > 7 ? 7 : Players[me].team, Players[net.uid].name);
                        else if (i == net.uid)
-                               msg_add("\\%d%s died",
+                               msg_add("\\%d" MSG_GAME_KILL_2_2,
                                        Players[i].team > 7 ? 7 : Players[i].team, Players[i].name);
                        else
-                               msg_add("\\%d%s fragged %s",
+                               msg_add("\\%d" MSG_GAME_KILL_2_3,
                                        Players[i].team > 7 ? 7 : Players[i].team, Players[i].name,
                                        Players[net.uid].name);
                        game_setpaused();
@@ -688,9 +688,9 @@ static void game_loop(void)
                                netint4 data[4];
 
                                Players[me].alive = 0;
-                               if (lastadd == me) msg_add("\\%dYou died",
+                               if (lastadd == me) msg_add("\\%d" MSG_GAME_KILL_1_1,
                                        Players[me].team > 7 ? 7 : Players[me].team);
-                               else msg_add("\\%d%s fragged you",
+                               else msg_add("\\%d" MSG_GAME_KILL_2_1,
                                        Players[lastadd].team > 7 ? 7 : Players[lastadd].team,
                                        Players[lastadd].name);
                                if (Game.type == GT_classicTwo)

diff --git a/curses.c b/curses.c
index 4d350fd6e2cf301ba197a9fe4df63b441413586b..b60433e97e86134e402444fb5dc8cc8518a7453c 100644 (file)
--- a/curses.c
+++ b/curses.c
@@ -599,24 +599,24 @@ void window_msg_status(int player)
        if (Players[player].alive > 0)
                if (Players[player].flags & SCF_paused)
                        if (Game.started > 1)
-                               window_msg_wide(player, "PAUSED");
+                               window_msg_wide(player, MSG_PLAYER_PAUSE);
                        else
-                               window_msg_wide(player, "NOT READY");
+                               window_msg_wide(player, MSG_PLAYER_JOIN);
                else
                        if (Game.started > 1)
                                window_msg(player, NULL);
                        else
-                               window_msg_wide(player, "READY");
+                               window_msg_wide(player, MSG_PLAYER_START);
        else if (!Players[player].alive)
-               window_msg_wide(player, "GAME OVER");
+               window_msg_wide(player, MSG_PLAYER_STOP);
        else
-               window_msg_wide(player, "EMPTY");
+               window_msg_wide(player, MSG_PLAYER_PART);
 }
 
 
 void status_tick(void)
 { //display timer
-       mvprintw(statusYPos, statusXPos, "timer %7.0f ", CurTimeval() / 1e6);
+       mvprintw(statusYPos, statusXPos, MSG_TIME, CurTimeval() / 1e6);
 }
 
 void ScheduleFullRedraw(void)

diff --git a/msg.en.h b/msg.en.h
index ab042d5e21eaffae60c9efbd4fd4c39d0a0a4e54..a013b4bbaee1676bf2724270fe0d3ba30712e324 100644 (file)
--- a/msg.en.h
+++ b/msg.en.h
@@ -5,10 +5,42 @@
 #define MSG_PPM     "ppm %9.1f"
 #define MSG_APM     "apm %9.1f"
 #define MSG_YIELD   "yield    %3d%%"
+#define MSG_TIME    "timer %7.0f "
 
 #define MSG_TITLE    "NETRIS"
 #define MSG_TITLESUB "(C)1994-1996,1999 Mark H. Weaver, (C)2002 Shiar"
 
+#define MSG_PLAYER_JOIN  "NOT READY"
+#define MSG_PLAYER_START "READY"
+#define MSG_PLAYER_PAUSE "PAUSED"
+#define MSG_PLAYER_STOP  "GAME OVER"
+#define MSG_PLAYER_PART  "EMPTY"
+
+#define MSG_GAME_JOIN         "%s joined the game"
+#define MSG_GAME_JOIN_TEAM    "%s joined %s team"
+#define MSG_GAME_PART         "%s left"
+#define MSG_GAME_START        "The game has started"
+#define MSG_GAME_STOP         "The game has ended"
+#define MSG_GAME_WINNER       "%s won after %0.0f'%02d\""
+#define MSG_GAME_PAUSE        "%s paused the game"
+#define MSG_GAME_PAUSE_SELF   "You paused the game"
+#define MSG_GAME_UNPAUSE      "%s unpaused the game"
+#define MSG_GAME_UNPAUSE_SELF "You unpaused the game"
+#define MSG_GAME_READY        "%s is ready"
+#define MSG_GAME_READY_SELF   "You are ready"
+#define MSG_GAME_UNREADY      "%s is not ready"
+#define MSG_GAME_UNREADY_SELF "You are not ready"
+#define MSG_GAME_LINE_SELF    "You cleared %d lines"
+#define MSG_GAME_LINES        "%s sends %d lines"
+#define MSG_GAME_LINES_SELF   "You send %d lines"
+#define MSG_GAME_KILL_1_1     "You died"
+#define MSG_GAME_KILL_1_2     "You fragged %s"
+#define MSG_GAME_KILL_2_1     "%s fragged you"
+#define MSG_GAME_KILL_2_2     "%s died"
+#define MSG_GAME_KILL_2_3     "%s fragged %s"
+
+#define MSG_CMD_EUNKNOWN "Unknown command /%s"
+
 #define MSG_SERVER_TITLE "NETRIS Server %s\t(c) 2002 Shiar <shiar@shiar.org>"
 #define MSG_SERVER_DBG_SEND ": send %d from %d to %d" // type, source id, target id
 #define MSG_SERVER_DBG_RECV ": %d sent %d" // source fd, type