code duplication

[netris.git] / netris.h

diff --git a/netris.h b/netris.h
index d6370a64faec8aa00bb1741311bd70c7c076ce55..31c08f1f1c4f905dc741abd193b7f73f74faa59b 100644 (file)
--- a/netris.h
+++ b/netris.h
@@ -57,7 +57,7 @@ typedef long netint4;
 
 /* Protocol versions */
 #define MAJOR_VERSION     1
-#define PROTOCOL_VERSION  4
+#define PROTOCOL_VERSION  6
 
 #define DEFAULT_PORT 9284  /* Very arbitrary */
 
@@ -146,8 +146,6 @@ typedef struct _EventGenRec {
        int bufSize, bufGoal;
 } EventGenRec;
 
-MyEventType NetGenFunc(EventGenRec *gen, MyEvent *event);
-
 /* NP_startConn flags */
 #define SCF_paused  1
 
@@ -159,14 +157,14 @@ typedef struct {
        int boardHeight, boardWidth, boardVisible;
        int curX, curY;
        char curShape, nextShape;
-       struct _Score {
+       struct score_t {
                short level;
                long score;
                int pieces, lines, adds;
        } score;
        char host[256];  //last
-} _Player;
-EXT _Player Players[MAX_SCREENS];
+} player_t;
+EXT player_t Players[MAX_SCREENS];
 EXT short me;
 EXT short maxPlayer;
 EXT int spied; //in player.flags
@@ -182,10 +180,11 @@ typedef struct {
        int started;     //2
        int continuous;  //3
        long seed;       //4
+       float shapes[7];
        int initspeed;   //5
        int speed;
-} _Game;
-EXT _Game Game;
+} game_t;
+EXT game_t Game;
 
 #define MSG_WIDTH 128