code duplication

[netris.git] / inet.c

diff --git a/inet.c b/inet.c
index 36ba001272e2ea35610ce8e81f9e54feee2b5708..33d49b05c0a767b826c951c031bc1caea82b76da 100644 (file)
--- a/inet.c
+++ b/inet.c
@@ -34,15 +34,15 @@
 #define HEADER_SIZE sizeof(netint2[2])
 #define HEADER_SIZE3 sizeof(netint4[3])
 
-MyEventType NetGenFunc(EventGenRec *gen, MyEvent *event);
-EventGenRec netGen = {
+static MyEventType NetGenFunc(EventGenRec *gen, MyEvent *event);
+static EventGenRec netGen = {
        NULL, 0, FT_read, -1, NetGenFunc, EM_net, 0, "\0", 0, HEADER_SIZE3
 };
 
 
 static sigjmp_buf close_env;
 
-void CatchInt(int sig)
+static void CatchInt(int sig)
 {
        siglongjmp(close_env, 1);
 }
@@ -95,11 +95,11 @@ void HandShake(void)
                        case NP_hello:
                        {
                                me = event.u.net.uid;
-                               memcpy(&Players[me], &Players[0], sizeof(_Player));
+                               memcpy(&Players[me], &Players[0], sizeof(player_t));
                                fprintf(stderr, "Accepted (%s) as #%d (%s)\n",
                                        event.u.net.data, me, Players[me].name);
                                SendPacket(0, NP_newPlayer,
-                                       sizeof(_Player) - sizeof(Players[me].host),
+                                       sizeof(player_t) - sizeof(Players[me].host),
                                        &Players[me]);
                                break;
                        }
@@ -117,6 +117,7 @@ void HandShake(void)
                                        int started;     //2
                                        int continuous;  //3
                                        long seed;       //4
+                                       float shapes[7];
                                        int initspeed;   //5
                                } data;
 
@@ -141,7 +142,7 @@ void HandShake(void)
 }
 
 
-MyEventType NetGenFunc(EventGenRec *gen, MyEvent *event)
+static MyEventType NetGenFunc(EventGenRec *gen, MyEvent *event)
 { //receive
        int result;
        short uid, type, size;