Update of /cvsroot/netrek/client/netrekxp/include
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv30468/include
Modified Files:
defs.h packets.h proto.h struct.h
Log Message:
Add new dashboard timerType that displays info from generic 32 b packet in
order of importance (INL time > surrender time > sb reconstruct time > time since t mode started). Defaults to current time of day if server does not use generic 32 b.
Index: defs.h
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/include/defs.h,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- defs.h 19 Apr 2008 16:22:56 -0000 1.33
+++ defs.h 16 Jul 2008 00:16:08 -0000 1.34
@@ -487,7 +487,8 @@
#define T_SERVER 2 /* time on server */
#define T_SHIP 3 /* time in ship */
#define T_USER 4 /* user reset timer */
-#define T_TOTAL 5 /* number of T_ defs */
+#define T_UTIL 5 /* t mode/sb/inl/surr time, from generic 32 */
+#define T_TOTAL 6 /* number of T_ defs */
/* The maximum length of message in buffer */
#define MAX_MLENGTH 286
Index: packets.h
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/include/packets.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- packets.h 14 Jul 2008 01:52:47 -0000 1.16
+++ packets.h 16 Jul 2008 00:16:09 -0000 1.17
@@ -903,7 +903,9 @@
unsigned short s_bitmap;
};
-#pragma pack(push,1)
+#pragma pack(push,1) /* Necessary to remove padding during compile,
+ size of struct needs to be exact, GCC equivalent
+ is __attribute__ (( packed )) */
struct generic_32_spacket
{
char type;
@@ -937,7 +939,7 @@
u_char team_remain; /* team surrender time, seconds */
char pad1[18];
};
-#pragma pack(pop)
+#pragma pack(pop) /* Restores packing values saved by push */
#define GENERIC_32_VERSION_B 2
#define GENERIC_32_VERSION GENERIC_32_VERSION_B /* default */
Index: struct.h
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/include/struct.h,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- struct.h 12 Jul 2008 03:49:45 -0000 1.29
+++ struct.h 16 Jul 2008 00:16:09 -0000 1.30
@@ -166,6 +166,23 @@
* (append) ) byte18++: the text to pre or append .. depending on termination
* above. text is null terminated and the last thing in this distress */
+/* The following defines are for gameup field */
+#define GU_GAMEOK 0x1
+#define GU_PRACTICE 0x2 /* Basepractice robot is present */
+/* also set by INL robot during a pause, in pre-game, or post-game */
+#define GU_CHAOS 0x4
+/* also set by INL robot in post-game */
+#define GU_PAUSED 0x8
+#define GU_INROBOT 0x10 /* INL robot is present */
+#define GU_NEWBIE 0x20 /* Newbie robot is present */
+#define GU_PRET 0x40 /* Pre-t robot is present */
+#define GU_BOT_IN_GAME 0x80 /* Pre-t robot + bots are present */
+#define GU_CONQUER 0x100 /* conquest parade in progress */
+#define GU_PUCK 0x200 /* Hockey robot is present */
+#define GU_DOG 0x400 /* Dogfight robot is present */
+#define GU_INL_DRAFTING 0x800 /* INL draft pre-game is in progress */
+#define GU_INL_DRAFTED 0x1000 /* INL draft game is in progress */
+
#define PFREE 0
#define POUTFIT 1
#define PALIVE 2
Index: proto.h
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/include/proto.h,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -d -r1.63 -r1.64
--- proto.h 19 Apr 2008 16:22:56 -0000 1.63
+++ proto.h 16 Jul 2008 00:16:09 -0000 1.64
@@ -1161,6 +1161,7 @@
void initialize_plasmas (void);
void initialize_torps (void);
void initialize_phasers (void);
+void initialize_context (void);
// Paradise handlers
void build_default_configuration (void);
void load_default_teams (void);