Update of /cvsroot/netrek/client/netrekxp/include
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv18320/include
Modified Files:
bitmaps.h data.h packets.h proto.h struct.h
Log Message:
Paradise only changes:
1) Colorized drone bitmaps by team.
2) Support for terrain, terrain info, status2, temp, exentension1, and game
conf packets.
3) Support for ranks and royalties, including paradise rank window.
Paradise changes with overall impact:
1) Added zdll.lib to linked libs, needed for uncompress of paradise terrain
packets.
Regular changes:
1) Wheel mouse up/down now is zoom in/out instead of accel/decel.
2) Bug fix for mono plasma and torp animations, last frame was being
cut off.
Index: data.h
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/include/data.h,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -d -r1.87 -r1.88
--- data.h 18 May 2007 19:54:36 -0000 1.87
+++ data.h 25 May 2007 03:36:44 -0000 1.88
@@ -40,6 +40,7 @@
#ifdef PARADISE
extern struct status2 *status2;
extern struct thingy *thingies;
+extern struct t_unit *terrainInfo;
#endif
extern struct ship *myship;
extern struct stats *mystats;
@@ -279,6 +280,9 @@
extern double Sin[], Cos[];
#ifdef PARADISE
+extern int received_terrain_info;
+extern int terrain_x;
+extern int terrain_y;
extern int gwidth; /* galaxy width, adjusted for zoom [BDyess] */
extern int offsetx;
extern int offsety; /* offsets when zooming [BDyess] */
@@ -345,7 +349,9 @@
//Paradise bitmaps
#ifdef PARADISE
-extern W_Icon drone_bitmap, dronec_bitmap, mdronec_bitmap;
+extern W_Icon drone_bitmap;
+extern W_Icon base_dronec_bitmap;
+extern W_Icon dronec_bitmap[NUM_CTORP_TYPES];
extern W_Icon base_drone_explosion_bitmap;
extern W_Icon drone_explosion_bitmap[BMP_DRONEDET_FRAMES];
extern W_Icon base_dronec_explosion_bitmap;
@@ -427,6 +433,12 @@
extern char login[PSEUDOSIZE];
extern struct rank ranks[NUMRANKS];
+#ifdef PARADISE
+extern struct rank2 *ranks2;
+extern struct royalty *royal;
+extern int nranks2;
+extern int nroyals;
+#endif
extern W_Window messagew, w, mapw, statwin, baseWin, infow, tstatw,
war, warnw, helpWin, teamWin[4], qwin, messwa, messwt, messwi,
Index: bitmaps.h
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/include/bitmaps.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- bitmaps.h 18 May 2007 19:54:36 -0000 1.20
+++ bitmaps.h 25 May 2007 03:36:44 -0000 1.21
@@ -199,7 +199,6 @@
#ifdef PARADISE
#define BMP_DRONE 9
#define BMP_DRONEC 10
-#define BMP_MDRONEC 11
#define BMP_DRONE_WIDTH 6
#define BMP_DRONE_HEIGHT 6
#define BMP_DRONECLOUD 12
Index: packets.h
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/include/packets.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- packets.h 17 May 2007 08:49:47 -0000 1.9
+++ packets.h 25 May 2007 03:36:44 -0000 1.10
@@ -199,6 +199,10 @@
* verification */
#endif
+#ifdef PARADISE
+/* the CP_ASK_MOTD packet is the same as temp_spacket */
+#define CP_ASK_MOTD 38 /* request MOTD */
+#endif
#define CP_PLANET 38 /* cross-check planet info */
#define CP_PING_RESPONSE 42 /* client response */
Index: struct.h
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/include/struct.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- struct.h 18 May 2007 19:54:36 -0000 1.21
+++ struct.h 25 May 2007 03:36:44 -0000 1.22
@@ -93,6 +93,12 @@
char shortname[4]; /* 3-letter abbreviation */
};
+struct t_unit {
+/* int alt1;*/
+/* int alt2;*/ /* Terrain types. */
+ char types;
+};
+
/* MOTD structures */
struct piclist {
int page;
@@ -754,6 +760,22 @@
char *name, *cname;
};
+#ifdef PARADISE
+struct rank2 { /* Paradise ranks */
+ int genocides; /* minimum number of genocides */
+ float di; /* minimum destruction inflicted */
+ float battle; /* minimum battle ratings */
+ float strategy; /* minimum strategy ratings */
+ float specship; /* minimum total ratings in a specialty */
+ /* ship SB + WB + JS */
+ char *name; /* name of this rank */
+};
+
+struct royalty { /* Paradise royalty ranks */
+ char *name; /* name of rank */
+};
+#endif
+
struct memory
{
struct player players[MAXPLAYER];
@@ -761,6 +783,10 @@
struct plasmatorp plasmatorps[MAXPLAYER * MAXPLASMA];
#ifdef PARADISE
struct thingy thingies[MAXPLAYER * 20]; // Arbitrary
+ struct rank2 ranks2[30]; // Arbitrary
+ struct teaminfo_s teaminfo[6]; // Arbitrary
+ struct royalty royal[5]; // Arbitrary
+ struct status2 status2[1]; // Arbitrary
#endif
struct status status[1];
struct planet planets[MAXPLANETS];
Index: proto.h
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/include/proto.h,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -d -r1.57 -r1.58
--- proto.h 18 May 2007 19:54:36 -0000 1.57
+++ proto.h 25 May 2007 03:36:44 -0000 1.58
@@ -820,6 +820,7 @@
int realNumShips (int owner);
int deadTeam (int owner);
int checkBold (char *line);
+void ClearMotd (void);
void showMotdWin (W_Window motdwin, int atline);
struct list;
void showValues (struct list *data);