outline server messages

diff --git a/msg.en.h b/msg.en.h
index 4f41af24f9927ee656720c13173840f587c5f08c..ab042d5e21eaffae60c9efbd4fd4c39d0a0a4e54 100644 (file)
--- a/msg.en.h
+++ b/msg.en.h
@@ -9,3 +9,21 @@
 #define MSG_TITLE    "NETRIS"
 #define MSG_TITLESUB "(C)1994-1996,1999 Mark H. Weaver, (C)2002 Shiar"
 
+#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
+#define MSG_SERVER_CONNECT "+ Connection: %s" // hostname
+#define MSG_SERVER_PLAYER_EVERSION "= Wrong version player #%d (%s)"
+#define MSG_SERVER_PLAYER_ACCEPT "* Accepted player #%d"
+#define MSG_SERVER_PLAYER_JOIN_ESTARTED "- Can't join player #%d in non-continuous game"
+#define MSG_SERVER_PLAYER_JOIN "> Joined player #%d: %s <%s> (%s)" // nr, name, host, team
+#define MSG_SERVER_PLAYER_DIE "< Player #%d died"
+#define MSG_SERVER_PLAYER_PAUSE "* Player #%d (un)paused (pause=%d)"
+#define MSG_SERVER_PLAYER_CLOSED "- Closed connection to player #%d"
+#define MSG_SERVER_PLAYER_QUIT "- Quit player #%d"
+#define MSG_SERVER_CLOSE_ALL "- Closing connections..."
+#define MSG_SERVER_CLOSE_ALL_DONE "* All Done"
+#define MSG_SERVER_GAME_READY "* Game (%010d) ready to start"
+#define MSG_SERVER_GAME_START "* Game starts"
+#define MSG_SERVER_GAME_STOP  "* Stopping game"
+

diff --git a/server.c b/server.c
index b30ba02a21e2bf3d4c424d646666e6964b973097..3eebe8ae9a54eaa06f83a6eb86f80ad46c6ac122 100644 (file)
--- a/server.c
+++ b/server.c
@@ -33,6 +33,7 @@
 #include <setjmp.h>
 
 #include "util.h"
+#include "msg.h"
 
 #define HEADER_SIZE sizeof(netint4[3])
 
@@ -84,7 +85,7 @@ void SendPacketTo(short playa, short uid, NetPacketType type, int size, void *da
 
        if (netGen[playa].fd >= 0) {
                if (verbose)
-                       fprintf(stderr, ": send %d from %d to %d\n", type, uid, playa);
+                       fprintf(stderr, MSG_SERVER_DBG_SEND "\n", type, uid, playa);
                header[0] = hton4(uid);
                header[1] = hton4(type);
                header[2] = hton4(size + HEADER_SIZE);
@@ -120,10 +121,10 @@ void CloseNets(void)
 { //nou oogjes dicht en snaveltjes toe
        int i;
 
-       fprintf(stderr, "- Closing connections...\n");
+       fprintf(stderr, MSG_SERVER_CLOSE_ALL "\n");
        for (i = 1; i < MAX_SCREENS; i++)
                SCloseNet(i); // bye everybuddy
-       fprintf(stderr, "* All Done\n\n");
+       fprintf(stderr, MSG_SERVER_CLOSE_ALL_DONE "\n\n");
 }
 
 MyEventType NetGenFunc(EventGenRec *gen, MyEvent *event)
@@ -135,7 +136,7 @@ MyEventType NetGenFunc(EventGenRec *gen, MyEvent *event)
        result = MyRead(gen->fd, gen->buf + gen->bufSize,
                gen->bufGoal - gen->bufSize);
        if (result < 0) {
-               fprintf(stderr, "- Closed connection to player #%d\n", gen->player);
+               fprintf(stderr, MSG_SERVER_PLAYER_CLOSED "\n", gen->player);
                return E_lostConn;
        }
        gen->bufSize += result;
@@ -156,7 +157,7 @@ MyEventType NetGenFunc(EventGenRec *gen, MyEvent *event)
        event->u.net.size = size - HEADER_SIZE;
        event->u.net.data = gen->buf + HEADER_SIZE;
        if (type == NP_endConn) {
-               fprintf(stderr, "- Quit player #%d\n", gen->player);
+               fprintf(stderr, MSG_SERVER_PLAYER_QUIT "\n", gen->player);
                return E_lostConn;
        } //client sent quit signal
        return E_net;
@@ -178,7 +179,7 @@ static MyEventType ConnGenFunc(EventGenRec *gen, MyEvent *event)
                netGen[new].fd = accept(gen->fd, (struct sockaddr *)&addr, &addrLen)
        ) < 0)
                die("accept");
-       fprintf(stderr, "+ Connection: %s\n", inet_ntoa(addr.sin_addr));
+       fprintf(stderr, MSG_SERVER_CONNECT "\n", inet_ntoa(addr.sin_addr));
        val2.l_onoff = 1;
        val2.l_linger = 0;
        setsockopt(netGen[new].fd, SOL_SOCKET, SO_LINGER,(void *)&val2,
@@ -242,7 +243,7 @@ int StartServer(void)
                                SCloseNet(event.u.net.sender);
                                break; //NP_endConn
                        case E_net:
-                               if (verbose) fprintf(stderr, ": %d sent %d\n",
+                               if (verbose) fprintf(stderr, MSG_SERVER_DBG_RECV "\n",
                                        netGen[event.u.net.sender].fd, event.u.net.type);
                                switch(event.u.net.type) {
                                case NP_hello:
@@ -261,13 +262,13 @@ int StartServer(void)
                                                snprintf(data, sizeof(data),
                                                        "Version mismatch: received %d.%d",
                                                        major, protocolVersion);
-                                               fprintf(stderr, "= Wrong version player #%d (%s)\n",
+                                               fprintf(stderr, MSG_SERVER_PLAYER_EVERSION "\n",
                                                        event.u.net.sender, data);
                                                SendPacketTo(event.u.net.sender, 0, NP_error,
                                                        strlen(data)+1, data);
                                                SCloseNet(event.u.net.sender);
                                        } //version mismatch
-                                       fprintf(stderr, "* Accepted player #%d\n",
+                                       fprintf(stderr, MSG_SERVER_PLAYER_ACCEPT "\n",
                                                event.u.net.sender);
                                        break;
                                } //NP_hello
@@ -295,8 +296,8 @@ int StartServer(void)
                                        if (!Game.continuous && Game.started >= 2) {
                                                char data[40];
                                                strcpy(data, "Can't join: Game has already started");
-                                               fprintf(stderr, "- Can't join player #%d in "
-                                                       "non-continuous game\n", event.u.net.sender);
+                                               fprintf(stderr, MSG_SERVER_PLAYER_JOIN_ESTARTED,
+                                                       event.u.net.sender);
                                                SendPacketTo(event.u.net.sender, 0, NP_error,
                                                        strlen(data)+1, data);
 //                                             SCloseNet(event.u.net.sender, 0);
@@ -328,7 +329,7 @@ int StartServer(void)
                                                        SendPacketTo(i, event.u.net.sender, NP_newPlayer,
                                                                sizeof(_Player), &Players[event.u.net.sender]);
                                                } //send (to) players
-                                       fprintf(stderr, "> Joined player #%d: %s <%s> (%s)\n",
+                                       fprintf(stderr, MSG_SERVER_PLAYER_JOIN "\n",
                                                event.u.net.sender,
                                                Players[event.u.net.sender].name,
                                                Players[event.u.net.sender].host,
@@ -352,7 +353,7 @@ int StartServer(void)
                                        goto sendtoall;
                                case NP_argghhh:
                                        Players[event.u.net.sender].alive = 0;
-                                       fprintf(stderr, "< Player #%d died\n",
+                                       fprintf(stderr, MSG_SERVER_PLAYER_DIE "\n",
                                                event.u.net.sender);
                                        //check for unpaused game
                                case NP_pause:
@@ -362,7 +363,7 @@ int StartServer(void)
                                        for (i = 1; i < MAX_SCREENS; i++)
                                                if (Players[i].alive > 0)
                                                        paused |= (Players[i].flags & SCF_paused) != 0;
-                                       fprintf(stderr, "* Player #%d (un)paused (pause=%d)\n",
+                                       fprintf(stderr, MSG_SERVER_PLAYER_PAUSE "\n",
                                                event.u.net.sender, paused);
                                        goto sendtoall;
                                } //NP_pause
@@ -395,13 +396,13 @@ int StartServer(void)
                CountPlayers();
                if (Game.started < 1) {
                        if (playercount >= 2) {
-                               fprintf(stderr, "* Game (%010d) ready to start\n", Game.seed);
+                               fprintf(stderr, MSG_SERVER_GAME_READY "\n", Game.seed);
                                Game.started++;
                        } //give goahead
                } //game not yet started
                else {
                        if (playercount < 2) {
-                               fprintf(stderr, "* Stopping game\n");
+                               fprintf(stderr, MSG_SERVER_GAME_STOP "\n");
                                if (Game.seed) Game.seed++;
                                if (Game.started > 1) for (i = 1; i < MAX_SCREENS; i++) {
                                        if (Players[i].alive >= 0) {
@@ -416,7 +417,7 @@ int StartServer(void)
                        } //too few players for game
                        if (Game.started == 1 && !paused) {
                                Game.started++;
-                               fprintf(stderr, "* Game starts\n");
+                               fprintf(stderr, MSG_SERVER_GAME_START "\n");
                                for (i = 1; i < MAX_SCREENS; i++)
                                        if (Players[i].alive > 0)
                                                SendPacketTo(i, 0, NP_start, 0, NULL);
@@ -429,9 +430,7 @@ int StartServer(void)
 
 void SHeader(void)
 {
-       fprintf(stderr,
-               "NETRIS Server %s\t(c) 2002 Shiar <shiar@shiar.org>\n\n",
-               version_string);
+       fprintf(stderr, MSG_SERVER_TITLE "\n\n", version_string);
 }
 
 void SUsage(void)