[netrek-cvs] client/netrekxp/include bitmaps.h, 1.23, 1.24 data.h, 1.93, 1.94

[Bill Balcerski]

Update of /cvsroot/netrek/client/netrekxp/include
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv29682/include

Modified Files:
	bitmaps.h data.h 
Log Message:
Update todo list.
Fix typo in changes.txt.
Adds new icons/pointers for paradise planets, rather than sharing the same data structures as bronco planets, so that paradise planet bitmaps are always loaded into memory.  Which planet bitmaps to use depends on whether it is a paradise server or not.

Index: bitmaps.h
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/include/bitmaps.h,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- bitmaps.h	12 Jun 2007 01:23:17 -0000	1.23
+++ bitmaps.h	12 Apr 2008 23:28:29 -0000	1.24
@@ -151,12 +151,11 @@
 #define BMP_MPLANET_HEIGHT 16
 
 #ifdef PARADISE
-#define PLANET_VIEWS 13
-#define MPLANET_VIEWS 13
-#else
+#define PARADISE_PLANET_VIEWS 13
+#define PARADISE_MPLANET_VIEWS 13
+#endif
 #define PLANET_VIEWS 9
 #define MPLANET_VIEWS 9
-#endif
 
 // Color planets
 

Index: data.h
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/include/data.h,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -d -r1.93 -r1.94
--- data.h	6 Apr 2008 22:41:42 -0000	1.93
+++ data.h	12 Apr 2008 23:28:29 -0000	1.94
@@ -281,6 +281,7 @@
 extern double Sin[], Cos[];
 
 #ifdef PARADISE
+extern int paradise;
 extern int received_terrain_info;
 extern int terrain_x;
 extern int terrain_y;
@@ -430,6 +431,12 @@
 extern W_Icon base_mplanets;
 extern W_Icon bplanets[PLANET_VIEWS];
 extern W_Icon bmplanets[MPLANET_VIEWS];
+#ifdef PARADISE
+extern W_Icon paradise_base_planets;
+extern W_Icon paradise_base_mplanets;
+extern W_Icon paradise_bplanets[PARADISE_PLANET_VIEWS];
+extern W_Icon paradise_bmplanets[PARADISE_PLANET_VIEWS];
+#endif
 extern W_Color borderColor, backColor, textColor, myColor, warningColor,
     shipCol[5], rColor, yColor, gColor, unColor, foreColor;
 extern char *colornames[COLORS];