git.shiar.nl
/
netris.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
log recent (major) changes
[netris.git]
/
netris.h
diff --git
a/netris.h
b/netris.h
index e04336eb138d8f3235056f6070eab3a89b7d24d1..31c08f1f1c4f905dc741abd193b7f73f74faa59b 100644
(file)
--- a/
netris.h
+++ b/
netris.h
@@
-57,7
+57,7
@@
typedef long netint4;
/* Protocol versions */
#define MAJOR_VERSION 1
/* Protocol versions */
#define MAJOR_VERSION 1
-#define PROTOCOL_VERSION
4
+#define PROTOCOL_VERSION
6
#define DEFAULT_PORT 9284 /* Very arbitrary */
#define DEFAULT_PORT 9284 /* Very arbitrary */
@@
-128,10
+128,6
@@
typedef struct _MyEvent {
union {
char key;
_netEvent net;
union {
char key;
_netEvent net;
- struct {
- int size;
- char *data;
- } robot;
} u;
} MyEvent;
} u;
} MyEvent;
@@
-150,8
+146,6
@@
typedef struct _EventGenRec {
int bufSize, bufGoal;
} EventGenRec;
int bufSize, bufGoal;
} EventGenRec;
-MyEventType NetGenFunc(EventGenRec *gen, MyEvent *event);
-
/* NP_startConn flags */
#define SCF_paused 1
/* NP_startConn flags */
#define SCF_paused 1
@@
-163,14
+157,14
@@
typedef struct {
int boardHeight, boardWidth, boardVisible;
int curX, curY;
char curShape, nextShape;
int boardHeight, boardWidth, boardVisible;
int curX, curY;
char curShape, nextShape;
- struct
_Score
{
+ struct
score_t
{
short level;
long score;
int pieces, lines, adds;
} score;
char host[256]; //last
short level;
long score;
int pieces, lines, adds;
} score;
char host[256]; //last
-}
_Player
;
-EXT
_Player
Players[MAX_SCREENS];
+}
player_t
;
+EXT
player_t
Players[MAX_SCREENS];
EXT short me;
EXT short maxPlayer;
EXT int spied; //in player.flags
EXT short me;
EXT short maxPlayer;
EXT int spied; //in player.flags
@@
-186,14
+180,20
@@
typedef struct {
int started; //2
int continuous; //3
long seed; //4
int started; //2
int continuous; //3
long seed; //4
+ float shapes[7];
int initspeed; //5
int speed;
int initspeed; //5
int speed;
-}
_Game
;
-EXT
_Game
Game;
+}
game_t
;
+EXT
game_t
Game;
#define MSG_WIDTH 128
EXT short port; // => just in client.c, parameter to inet connect
#define MSG_WIDTH 128
EXT short port; // => just in client.c, parameter to inet connect
+static const char *teamname[] = {
+ "", "Green", "Cyan", "Blue", "Purple",
+ "Red", "Grey", "White", "*Orange"
+};
+
#endif //__NETRIS_H
#endif //__NETRIS_H