Update of /cvsroot/netrek/client/netrekxp/include
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv29109/include
Modified Files:
proto.h struct.h
Log Message:
A bunch of paradise fixes and enhancements.
1) Fixed bug with paradise ALL messages going to the wrong windows.
2) Hopefully fixed bug with royals and ranks not being properly initialized.
3) Added paradise packet types to cambot. Cambot now seems to work for
recording and playback.
4) Added paradise info window, for both players and planets, so that players
can see stuff like planet atmosphere, and the different paradise ratings, using
the info keys 'i' and 'I'.
Index: struct.h
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/include/struct.h,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- struct.h 7 Jun 2007 04:43:37 -0000 1.23
+++ struct.h 24 Feb 2008 00:33:55 -0000 1.24
@@ -761,6 +761,36 @@
};
#ifdef PARADISE
+/* ratings struct */
+struct ratings {
+ float r_offrat; /* offense rating */
+ float r_planetrat; /* planets rating */
+ float r_bombrat; /* bombing rating */
+ float r_defrat; /* defense rating */
+ float r_resrat; /* resource rating */
+ float r_dooshrat; /* doosh rating */
+ float r_stratrat; /* strategy rating */
+ float r_batrat; /* battle rating */
+ float r_sbrat; /* sb rating */
+ float r_wbrat; /* wb rating */
+ float r_jsrat; /* js rating */
+ int r_jsplanets; /* js planets */
+ int r_resources; /* total resources bombed */
+ int r_armies; /* total armies bombed */
+ int r_planets; /* total planets taken */
+ int r_dooshes; /* total armies dooshed */
+ float r_specrat; /* special ship rating */
+ float r_di; /* damage inflicted */
+ float r_ratio; /* ratio, kills/losses */
+ int r_kills; /* kills */
+ int r_losses; /* losses */
+ float r_ratings; /* total ratings */
+ float r_killsPerHour; /* kills/hour */
+ float r_lossesPerHour; /* losses/hour */
+ float r_maxkills; /* max kills */
+ int r_genocides; /* number of genocides */
+};
+
struct rank2 { /* Paradise ranks */
int genocides; /* minimum number of genocides */
float di; /* minimum destruction inflicted */
Index: proto.h
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/include/proto.h,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -d -r1.58 -r1.59
--- proto.h 25 May 2007 03:36:44 -0000 1.58
+++ proto.h 24 Feb 2008 00:33:55 -0000 1.59
@@ -1155,6 +1155,7 @@
struct rsa_key_spacket;
void handleRSAKey (struct rsa_key_spacket *packet);
#ifdef PARADISE
+void build_default_configuration (void);
void handleScan (struct scan_spacket *packet);
void handleMotdPic (struct motd_pic_spacket * packet);
void handleStats2 (struct stats_spacket2 * packet);