Update of /cvsroot/netrek/client/netrekxp/include
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv12195/include
Modified Files:
data.h packets.h proto.h
Log Message:
SP_RANK, change naming and packet definitions to match
server protocol.
Index: data.h
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/include/data.h,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -d -r1.110 -r1.111
--- data.h 25 May 2009 14:43:52 -0000 1.110
+++ data.h 26 May 2009 02:18:17 -0000 1.111
@@ -661,7 +661,7 @@
extern int F_sp_flags_all;
extern int F_why_dead_2;
extern int F_auto_weapons;
-extern int F_sp_ranks;
+extern int F_sp_rank;
extern int F_terrain; /* paradise */
extern int F_armies_shipcap; /* paradise */
Index: packets.h
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/include/packets.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- packets.h 25 May 2009 14:43:53 -0000 1.21
+++ packets.h 26 May 2009 02:18:17 -0000 1.22
@@ -131,7 +131,7 @@
#define SP_S_PHASER 57 /* see struct */
#define SP_S_KILLS 58 /* # of kills player have */
#define SP_S_STATS 59 /* see SP_STATS */
-#define SP_RANKS 61 /* rank data */
+#define SP_RANK 61 /* rank data */
/* variable length packets */
#define VPLAYER_SIZE 4
@@ -853,17 +853,16 @@
#endif
-struct ranks_spacket
+struct rank_spacket
{
- char type; /* SP_RANKS */
+ char type; /* SP_RANK */
+ char pad[3];
int rankn; /* rank number */
- char name[11]; /* rank name */
- char cname[5]; /* short name */
- unsigned hours; /* where 1234=12.34 hours
- * and 0=0.00 hours */
- unsigned ratings; /* as per hours */
- unsigned offense; /* as per hours */
-
+ char name[16]; /* full rank name */
+ int hours; /* hundredths of hours required */
+ int ratings; /* hundredths of ratings required */
+ int offense; /* hundredths of offense required */
+ char cname[8]; /* short 'curt' rank name */
};
struct ship_cap_spacket
Index: proto.h
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/include/proto.h,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -d -r1.66 -r1.67
--- proto.h 25 May 2009 14:43:53 -0000 1.66
+++ proto.h 26 May 2009 02:18:17 -0000 1.67
@@ -1133,7 +1133,7 @@
void handleGeneric32 (struct generic_32_spacket *packet);
struct flags_all_spacket;
void handleFlagsAll (struct flags_all_spacket *packet);
-void handleRanks (struct ranks_spacket *packet);
+void handleRank (struct rank_spacket *packet);
void initialize_players (void);
void initialize_plasmas (void);
void initialize_torps (void);