unofficial version 0.7.1: ui improvements

[netris.git] / netris.h

diff --git a/netris.h b/netris.h
index b04e04036b2d04274fe18871b4d2c97d6e72ea7a..7bbfc3ce3fe25fda603f08c7f5b6579dcfd9f16b 100644 (file)
--- a/netris.h
+++ b/netris.h
@@ -28,20 +28,16 @@
 #include <stdio.h>
 #include <signal.h>
 
+#define version_string         "0.7.819"
+
 #define ExtFunc                /* Marks functions that need prototypes */
 
-#ifdef NOEXT
+#ifdef NOEXT   //prevent re-declaration
 # define EXT
-# define IN(a) a
 #else
 # define EXT extern
-# define IN(a)
 #endif
 
-/*#ifndef NULL
-  # define NULL ((void *)0)
-  #endif*/
-
 #ifdef HAS_SIGPROCMASK
 typedef sigset_t MySigSet;
 #else
@@ -71,37 +67,58 @@ typedef long netint4;
 
 #define CONFIG_FILE "netris.conf"
 
-//#define DEFAULT_KEYS "hlkj mspf^l"
-//#define DEFAULT_KEYS "4685 2spf^l"
-#define DEFAULT_KEYS "dcaf b^sp^f^l"
+//#define DEFAULT_KEYS "hlkj mfp^lq"
+//#define DEFAULT_KEYS "4685 2fp^lq"
+#define DEFAULT_KEYS "dcaf b^fp^lq"
 
 #define MAX_BOARD_WIDTH                32
 #define MAX_BOARD_HEIGHT       64
-#define MAX_SCREENS                    5
+#define MAX_SCREENS                    9 //8 players
 
 /* Event masks */
 #define EM_alarm                       000001
 #define EM_key                         000002
 #define EM_net                         000004
 #define EM_robot                       000010
+#define EM_connect                     000020
 #define EM_any                         000777
 
 typedef enum _GameType { GT_onePlayer, GT_classicTwo, GT_len } GameType;
 typedef enum _BlockTypeA {
-       BT_none, BT_white, BT_blue, BT_magenta, BT_cyan, BT_yellow, BT_green,
-       BT_red, BT_wall, BT_len
+       BT_shadow, BT_none,
+       BT_green, BT_cyan, BT_blue, BT_magenta, BT_red, BT_yellow, BT_white,
+       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_net, E_lostConn, E_robot, E_lostRobot
+       E_none, E_alarm, E_key, E_connect, E_net, E_lostConn, E_robot, E_lostRobot
 } MyEventType;
 typedef enum _NetPacketType {
-       NP_endConn, NP_byeBye,
-       NP_error, NP_hello, NP_gamedata, NP_newPlayer, NP_goAhead,
-       NP_pause, NP_giveJunk, NP_newPiece, NP_down, NP_left, NP_right,
-       NP_rotright, NP_rotleft, NP_drop, NP_clear, NP_insertJunk
+       NP_endConn,             //client/server quits
+       NP_byeBye,              //unused atm
+       NP_error,               //handshake error
+       NP_hello,               //check versions
+       NP_gamedata,    //game options
+
+       NP_start,               //game ok to start
+       NP_pause,               //player (un)pauses
+       NP_stop,                //game ended
+       NP_newPlayer,   //add new player
+       NP_argghhh,             //player died
+
+       NP_newPiece,    //new piece info
+       NP_rotright,    //rotate piece clockwise
+       NP_rotleft,             //rotate piece counterclockwise
+       NP_left,                //move piece left
+       NP_right,               //move piece right
+       NP_down,                //move piece one down
+       NP_drop,                //drop piece to bottom
+       NP_clear,               //line cleared
+       NP_insertJunk,  //player added junk
+
+       NP_giveJunk             //player has to add junk
 } NetPacketType;
 
 typedef signed char BlockType;
@@ -137,7 +154,6 @@ typedef struct _EventGenRec {
        char buf[512];
        int bufSize, bufGoal;
 } EventGenRec;
-extern EventGenRec netGen[MAX_SCREENS];
 
 MyEventType NetGenFunc(EventGenRec *gen, MyEvent *event);
 
@@ -160,13 +176,13 @@ typedef int (*ShapeDrawFunc)(int scr, int y, int x,
 /* NP_startConn flags */
 #define SCF_usingRobot         000001
 #define SCF_fairRobot          000002
-#define SCF_setSeed                    000004
-
-EXT int totalPlayers;
+#define SCF_paused                     000004
 
 typedef struct _Player {
+       int alive;
        char name[16];
        int flags;
+       int team;
        int dropmode;
        int boardHeight, boardWidth, boardVisible;
        int curX, curY;
@@ -176,19 +192,25 @@ typedef struct _Player {
                long score;
                int drops, lines, adds;
        } score;
-       char host[256];
-       int spy;
+       char host[256]; //last-1
+       int spy,small;  //last
 } Player;
 EXT Player Players[MAX_SCREENS];
 EXT short me;
+EXT short maxPlayer;
+EXT int spied; //in player.flags
 
 #define DEFAULT_INTERVAL       1000000 /* Step-down interval in microseconds */
 #define SPEEDINC                       1.2
 #define SPEEDMINIMUM           40000
 
 typedef struct __Game {
-       long seed;
-       long initspeed, speed;
+       int maxplayers; //1
+       int started;    //2
+       int continuous; //3
+       long seed;              //4
+       int initspeed;  //5
+       int speed;
        int standout, color, ascii;
 } _Game;
 EXT _Game Game;
@@ -197,13 +219,12 @@ EXT GameType game;
 EXT int robotEnable, robotVersion, fairRobot;
 EXT int protocolVersion;
 
-EXT int initConn, waitConn;
-EXT char *hostStr, *portStr;
+EXT int initConn;
+EXT short port;
 
 EXT char scratch[1024];
 
 extern ShapeOption stdOptions[];
-extern char *version_string;
 
 #include "proto.h"