X-Git-Url: http://git.shiar.nl/netris.git/blobdiff_plain/b5a9cdfd671a10cd5b5e9f1f53105e9993414247..5902d7f327fcf57d2b1a47f1b4a3aa98f4ab08a8:/netris.h

diff --git a/netris.h b/netris.h
index cab651c..72e2522 100644
--- a/netris.h
+++ b/netris.h
@@ -29,9 +29,9 @@
 #include <stdio.h>
 #include <signal.h>
 
-#define version_string		"0.8"
+#define version_string "0.8"
 
-#ifdef NOEXT	//prevent re-declaration
+#ifdef NOEXT  //prevent re-declaration
 # define EXT
 #else
 # define EXT extern
@@ -58,10 +58,10 @@ typedef long netint4;
 #define ntoh4(x) ntohl(x)
 
 /* Protocol versions */
-#define MAJOR_VERSION		1	
-#define PROTOCOL_VERSION	4
+#define MAJOR_VERSION     1
+#define PROTOCOL_VERSION  4
 
-#define DEFAULT_PORT 9284	/* Very arbitrary */
+#define DEFAULT_PORT 9284  /* Very arbitrary */
 
 #define CONFIG_FILE "netris.conf"
 
@@ -69,16 +69,16 @@ typedef long netint4;
 //#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			9 //8 players
+#define MAX_BOARD_WIDTH    32
+#define MAX_BOARD_HEIGHT   64
+#define MAX_SCREENS         9 //8 players
 
 /* Event masks */
-#define EM_alarm			000001
-#define EM_key				000002
-#define EM_net				000004
-#define EM_connect			000020
-#define EM_any				000777
+#define EM_alarm       000001
+#define EM_key         000002
+#define EM_net         000004
+#define EM_connect     000020
+#define EM_any         000777
 
 typedef enum _GameType { GT_onePlayer, GT_classicTwo, GT_len } GameType;
 typedef enum _BlockTypeA {
@@ -93,33 +93,33 @@ typedef enum _MyEventType {
 	E_none, E_alarm, E_key, E_connect, E_net, E_lostConn
 } MyEventType;
 typedef enum _NetPacketType {
-	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_team,		//player switched teams
-	NP_argghhh,		//player died
-	NP_part,		//player left
-
-	NP_msg,			//chat message
-
-	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
+	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_team,        //player switched teams
+	NP_argghhh,     //player died
+	NP_part,        //player left
+
+	NP_msg,         //chat message
+
+	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 struct {
@@ -162,7 +162,7 @@ typedef struct _Shape {
 } Shape;
 
 /* NP_startConn flags */
-#define SCF_paused		1
+#define SCF_paused  1
 
 typedef struct {
 	int alive;
@@ -178,23 +178,23 @@ typedef struct {
 		long score;
 		int pieces, lines, adds;
 	} score;
-	char host[256];	//last
+	char host[256];  //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
+#define DEFAULT_INTERVAL  1000000  /* Step-down interval in microseconds */
+#define SPEEDINC          1.2
+#define SPEEDMINIMUM      40000
 
 typedef struct {
-	int gravity;	//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
+	int initspeed;   //5
 	int speed;
 } _Game;
 EXT _Game Game;