Update of /cvsroot/netrek/client/netrekxp/include
In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv26714/include
Modified Files:
data.h packets.h struct.h
Log Message:
Resorted the server and client TODO lists as much progress has been made on both fronts.
Added an internal showdetcircle variable that acts as toggle, rather than having client change
the value of the actual detcircle variable, so that when netrekrc is saved by the in game
save option, it doesn't use a false value for detcircle.
Added beep sound to invalid button presses in the declare war window.
Minimal functionality added to generic_32_spacket. currently receives repair_time, which is
also a new field in the player struct (p_repair_time). If server does not support the generic_32
feature, client will calculate repair time locally, as it has done in the past.
Netrekrc changes: rearranged keymap order, fixed typo in maxscrolllines message, improved
message describing useFullShipInfo, added new macro for clue game mailing list.
2 fixes to the keymap saving routine: support for mapping spacebar, and another fix so that
default macrokey is saved as well.
Fade out all sounds on quit (checked at end of redraw local).
Parsemeta changes: removed duplicate stringdefaults calls and placed them instead all
at in the same place, in parsemeta().
Index: data.h
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/include/data.h,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- data.h 12 Dec 2006 04:47:05 -0000 1.42
+++ data.h 13 Dec 2006 00:00:00 -0000 1.43
@@ -175,6 +175,7 @@
extern int colorWeapons;
extern int newDashboard, old_db;
extern int detCircle;
+extern int showdetCircle;
extern int puckCircle;
extern int showArmy;
extern int niftyNewMessages;
Index: packets.h
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/include/packets.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- packets.h 12 Dec 2006 04:47:05 -0000 1.2
+++ packets.h 13 Dec 2006 00:00:00 -0000 1.3
@@ -874,12 +874,24 @@
};
struct generic_32_spacket {
- char type; /* SP_GENERIC_32 Header */
- char version;
- int repair_time; /* Estimated repair time, in seconds */
- char pad1; /* TODO: Change to union */
+ char type; /* SP_GENERIC_32 */
+ char version; /* alphabetic */
+ short repair_time; /* server estimate of repair time in seconds */
+ char pad1[28];
};
+/* versioning instructions: we start with version 'a', and each time a
+ field is added increment the version and reduce the pad size,
+ keeping the packet the same size ... client is entitled to trust
+ fields in struct that were defined at a particular version. */
+
+/*
+ packet.type = SP_GENERIC_32;
+ packet.version = GENERIC_32_VERSION;
+ if (sizeof(struct generic_32_spacket) != GENERIC_32_LENGTH) abort();
+*/
+
+
#ifdef SHORT_PACKETS
struct shortreq_cpacket
{ /* CP_S_REQ */
Index: struct.h
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/include/struct.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- struct.h 10 Aug 2006 10:00:52 -0000 1.11
+++ struct.h 13 Dec 2006 00:00:00 -0000 1.12
@@ -287,6 +287,7 @@
* lock */
int p_pos; /* My position in the player
* file */
+ short p_repair_time; /* estimated time in seconds to a full repair */
};
struct statentry