X-Git-Url: http://git.shiar.net/netris.git/blobdiff_plain/029b3987ced68ca6a86c3da7bdfb536c5789590a..93d1d285b606413a0c60905f8b43389661ac30ec:/netris.h

diff --git a/netris.h b/netris.h
index 1af1db6..6cc395c 100644
--- 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,10 +78,9 @@ 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 _FDType { FT_read, FT_write, FT_except, FT_len } FDType;
@@ -161,7 +160,6 @@ typedef struct {
 	char name[16];
 	int flags;
 	int team;
-	int dropmode;
 	int boardHeight, boardWidth, boardVisible;
 	int curX, curY;
 	char curShape, nextShape;
@@ -181,7 +179,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
@@ -193,9 +193,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[10][7] = {
+	"", "Green", "Cyan", "Blue", "Purple",
+	"Red", "Grey", "White", "*Orange"
+};
 
 #endif //__NETRIS_H