code cleanup: use terniaries

[netris.git] / netris.h

diff --git a/netris.h b/netris.h
index df026d23ec23c02668913138268d5ed51c8c3b29..df459eb141478e2c58509ca49c04908bc1468c87 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 mfp^ltq"
+//#define DEFAULT_KEYS "4685 2fp^l^mq"
+#define DEFAULT_KEYS "dcaf b^fp^l^mq"
 
 #define MAX_BOARD_WIDTH    32
 #define MAX_BOARD_HEIGHT   64
@@ -81,11 +81,9 @@ typedef long netint4;
 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
@@ -155,10 +153,6 @@ typedef struct _EventGenRec {
 
 MyEventType NetGenFunc(EventGenRec *gen, MyEvent *event);
 
-typedef struct _Shape {
-       char shape, rotate;
-} Shape;
-
 /* NP_startConn flags */
 #define SCF_paused  1