X-Git-Url: http://git.shiar.nl/netris.git/blobdiff_plain/647a237119ca10b9c3039c157594599e7ff50411..HEAD:/inet.c

diff --git a/inet.c b/inet.c
index 236a73e..33d49b0 100644
--- 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,14 +34,15 @@
 #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);
 }
@@ -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 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);
+	} 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;
@@ -203,7 +202,3 @@ void CloseNet(void)
 		RemoveEventGen(&netGen);
 }
 
-/*
- * vi: ts=4 ai
- * vim: noai si
- */