code duplication

[netris.git] / inet.c

diff --git a/inet.c b/inet.c
index 8da9956b16917e3f236a9409432c8df139553e32..33d49b05c0a767b826c951c031bc1caea82b76da 100644 (file)
--- a/inet.c
+++ b/inet.c
@@ -15,8 +15,6 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- * $Id: inet.c,v 1.18 1996/02/09 08:22:13 mhw Exp $
  */
 
 #include "netris.h"
@@ -36,17 +34,18 @@
 #define HEADER_SIZE sizeof(netint2[2])
 #define HEADER_SIZE3 sizeof(netint4[3])
 
-MyEventType NetGenFunc(EventGenRec *gen, MyEvent *event);
-EventGenRec netGen =
-       { NULL, 0, FT_read, -1, NetGenFunc, EM_net, 0, "\0", 0, HEADER_SIZE3 };
+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);
-} //CatchInt
+}
 
 int InitiateConnection(char *hostStr, short port)
 { //connect to host
@@ -77,7 +76,7 @@ int InitiateConnection(char *hostStr, short port)
        }
        AddEventGen(&netGen);
        return 0;
-} //InitiateConnection
+}
 
 void HandShake(void)
 { //talk to your host
@@ -96,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;
                        }
@@ -114,17 +113,18 @@ void HandShake(void)
                        {
                                static struct {
                                        int playerflags;
-                                       int maxplayers; //1
-                                       int started;    //2
-                                       int continuous; //3
-                                       long seed;              //4
-                                       int initspeed;  //5
+                                       int gravity;     //1
+                                       int started;     //2
+                                       int continuous;  //3
+                                       long seed;       //4
+                                       float shapes[7];
+                                       int initspeed;   //5
                                } data;
 
                                memcpy(&data, event.u.net.data, event.u.net.size);
                                memcpy(&Players[me].flags, &data, sizeof(data.playerflags));
                                memcpy(&Players[me].flags, &data, sizeof(data.playerflags));
-                               memcpy(&Game, &data.maxplayers,
+                               memcpy(&Game.gravity, &data.gravity,
                                        sizeof(data) - sizeof(data.playerflags));
                                break;
                        } //NP_gamedata
@@ -138,12 +138,11 @@ void HandShake(void)
                        }
                else
                        fatal("Hm, the party apparantly ended prematurely.");
-       }
-       while (event.u.net.type != NP_gamedata);
-} //HandShake
+       } while (event.u.net.type != NP_gamedata);
+}
 
 
-MyEventType NetGenFunc(EventGenRec *gen, MyEvent *event)
+static MyEventType NetGenFunc(EventGenRec *gen, MyEvent *event)
 { //receive
        int result;
        short uid, type, size;
@@ -175,7 +174,7 @@ MyEventType NetGenFunc(EventGenRec *gen, MyEvent *event)
        event->u.net.data = gen->buf + HEADER_SIZE3;
        if (type == NP_endConn) return E_lostConn;
        return E_net;
-} //NetGenFunc
+}
 
 void SendPacket(short uid, NetPacketType type, int size, void *data)
 { //send shit to server
@@ -188,7 +187,7 @@ void SendPacket(short uid, NetPacketType type, int size, void *data)
                die("write (header)");
        if (size > 0 && data && MyWrite(netGen.fd, data, size) != size)
                die("write");
-} //SendPacket
+}
 
 void CloseNet(void)
 { //kick some connection's ass!
@@ -201,9 +200,5 @@ void CloseNet(void)
        }
        if (netGen.next)
                RemoveEventGen(&netGen);
-} //CloseNet
+}
 
-/*
- * vi: ts=4 ai
- * vim: noai si
- */