declaration cleanup

[netris.git] / netris.h

diff --git a/netris.h b/netris.h
index df026d23ec23c02668913138268d5ed51c8c3b29..28a4132403d7cdb66264aedf3e811d015e67bc95 100644 (file)
--- a/netris.h
+++ b/netris.h
@@ -63,9 +63,9 @@ typedef long netint4;
 
 #define CONFIG_FILE "netris.conf"
 
-//#define DEFAULT_KEYS "hlkj mfp^lq"
-//#define DEFAULT_KEYS "4685 2fp^lq"
-#define DEFAULT_KEYS "dcaf b^fp^lq"
+//#define DEFAULT_KEYS "hlkj mnfp^ltq"
+//#define DEFAULT_KEYS "4685 02fp^l^mq"
+#define DEFAULT_KEYS "dcaf xb^fp^l^mq"
 
 #define MAX_BOARD_WIDTH    32
 #define MAX_BOARD_HEIGHT   64
@@ -78,14 +78,11 @@ typedef long netint4;
 #define EM_connect     000020
 #define EM_any         000777
 
-typedef enum _GameType { GT_onePlayer, GT_classicTwo, GT_len } GameType;
 typedef enum _BlockTypeA {
        BT_shadow, BT_none,
-       BT_green, BT_cyan, BT_blue, BT_magenta, BT_red, BT_yellow, BT_white,
+       BT_S, BT_L, BT_I, BT_O, BT_Z, BT_J, BT_T,
        BT_wall, BT_len
 } BlockTypeA;
-typedef enum _Dir { D_down, D_right, D_up, D_left } Dir;
-typedef enum _Cmd { C_end, C_forw, C_back, C_left, C_right, C_plot } Cmd;
 typedef enum _FDType { FT_read, FT_write, FT_except, FT_len } FDType;
 typedef enum _MyEventType {
        E_none, E_alarm, E_key, E_connect, E_net, E_lostConn
@@ -131,10 +128,6 @@ typedef struct _MyEvent {
        union {
                char key;
                _netEvent net;
-               struct {
-                       int size;
-                       char *data;
-               } robot;
        } u;
 } MyEvent;
 
@@ -153,12 +146,6 @@ typedef struct _EventGenRec {
        int bufSize, bufGoal;
 } EventGenRec;
 
-MyEventType NetGenFunc(EventGenRec *gen, MyEvent *event);
-
-typedef struct _Shape {
-       char shape, rotate;
-} Shape;
-
 /* NP_startConn flags */
 #define SCF_paused  1
 
@@ -167,7 +154,6 @@ typedef struct {
        char name[16];
        int flags;
        int team;
-       int dropmode;
        int boardHeight, boardWidth, boardVisible;
        int curX, curY;
        char curShape, nextShape;
@@ -187,7 +173,9 @@ EXT int spied; //in player.flags
 #define SPEEDINC          1.2
 #define SPEEDMINIMUM      40000
 
+typedef enum _GameType { GT_onePlayer, GT_classicTwo, GT_len } GameType;
 typedef struct {
+       GameType type;
        int gravity;     //1
        int started;     //2
        int continuous;  //3
@@ -199,9 +187,12 @@ EXT _Game Game;
 
 #define MSG_WIDTH 128
 
-EXT GameType game; // => Game.type
+EXT short port; // => just in client.c, parameter to inet connect
 
-EXT short port; // => just in game.c, parameter to inet connect
+static const char *teamname[] = {
+       "", "Green", "Cyan", "Blue", "Purple",
+       "Red", "Grey", "White", "*Orange"
+};
 
 #endif //__NETRIS_H