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

diff --git a/netris.h b/netris.h
index 489dfac..6cc395c 100644
--- a/netris.h
+++ b/netris.h
@@ -78,7 +78,6 @@ 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_S, BT_L, BT_I, BT_O, BT_Z, BT_J, BT_T,
@@ -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
 
+static const char teamname[10][7] = {
+	"", "Green", "Cyan", "Blue", "Purple",
+	"Red", "Grey", "White", "*Orange"
+};
+
 #endif //__NETRIS_H