Update of /cvsroot/netrek/client/netrekxp/include
In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv21888/include
Modified Files:
bitmaps.h data.h
Log Message:
Version number change from 4 4 0 4 to 1 0 0 0
Hopefully fixed redraw problem with beeplite not refreshing planets on the planet map
Changed to constant border redraw vs. only redraw border on alert change - fixes some
problems with the new bitmap sets
Fix to detcircle and shield drawing for observers watching someone who cloaked..it would
miss a draw during the cloak cycle
Added "rotatePlanets: (on)/off" to use rotating planet graphics, only works with new
planet bitmaps
Rotating planets! Well, just the unknown (?) planet for now, lack of art is the holdup,
it might be awhile till the rest of the planets are done
Fixed tractor/pressors which overlap window border so that they don't overwrite border
Fixed continueTractors option (it wasn't working at all)
Index: bitmaps.h
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/include/bitmaps.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- bitmaps.h 20 May 2006 17:09:39 -0000 1.10
+++ bitmaps.h 2 Jun 2006 21:06:54 -0000 1.11
@@ -153,6 +153,10 @@
// Untouched planet
#define BMP_PLANET_UNKNOWN 9
+#define BMP_PLANET_UNKNOWN_NR 10
+
+// Map version of unknown planet
+#define BMP_PLANET_MUNKNOWN 11
// Resources
#define BMP_ARMYBMP 10
@@ -167,4 +171,4 @@
#define BMP_CPLANET_WIDTH 120
#define BMP_CPLANET_HEIGHT 120
-
+#define CPLANET_VIEWS 16
Index: data.h
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/include/data.h,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- data.h 31 May 2006 03:59:27 -0000 1.27
+++ data.h 2 Jun 2006 21:06:54 -0000 1.28
@@ -47,6 +47,7 @@
extern struct planet pdata[];
extern unsigned int oldalert;
+extern int alertBorderColor;
extern int remap[];
extern int udcounter;
extern char *title;
@@ -228,6 +229,7 @@
extern int showLock;
extern int planetBitmap;
extern int planetBitmapGalaxy;
+extern int rotatePlanets;
extern int logging;
extern int continueTractor;
extern int tcounter;
@@ -311,7 +313,10 @@
ori_bitmapsHR[NUM_TYPES], ind_bitmapsHR[NUM_TYPES];
// Planets
-extern W_Icon planet_unknown, mplanet_unknown;
+extern W_Icon planet_unknown_bitmap;
+extern W_Icon planet_unknown[CPLANET_VIEWS];
+extern W_Icon planet_unknown_NR;
+extern W_Icon mplanet_unknown;
extern W_Icon planet_bitmaps[8], mplanet_bitmaps[8];
extern W_Icon planet_earth[NUMTEAMS], planet_klingus[NUMTEAMS], planet_orion[NUMTEAMS],
planet_romulus[NUMTEAMS], planet_agri1[NUMTEAMS], planet_agri2[NUMTEAMS],