[netrek-cvs] client/netrekxp/include bitmaps.h, 1.9, 1.10 data.h, 1.17, 1.18 proto.h, 1.18, 1.19

[Bill Balcerski]

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

Modified Files:
	bitmaps.h data.h proto.h 
Log Message:
First attempt at some resource display for new planets.
Gonna have to rewrite doublebuffering code to make it an rc option, all these duplicate function calls is getting crazy
(or quadruple function calls when beeplite and doublebuffering come into play at once).

Index: bitmaps.h
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/include/bitmaps.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- bitmaps.h	16 May 2006 05:10:13 -0000	1.9
+++ bitmaps.h	20 May 2006 17:09:39 -0000	1.10
@@ -154,6 +154,16 @@
 // Untouched planet
 #define BMP_PLANET_UNKNOWN 9
 
+// Resources
+#define BMP_ARMYBMP 10
+#define BMP_ARMY_WIDTH 10
+#define BMP_ARMY_HEIGHT 30
+#define BMP_WRENCHBMP 11
+#define BMP_WRENCH_WIDTH 30
+#define BMP_WRENCH_HEIGHT 10
+#define BMP_FUELBMP 12
+#define BMP_FUEL_WIDTH 10
+#define BMP_FUEL_HEIGHT 30
 #define BMP_CPLANET_WIDTH 120
 #define BMP_CPLANET_HEIGHT 120
 

Index: data.h
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/include/data.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- data.h	19 May 2006 18:08:07 -0000	1.17
+++ data.h	20 May 2006 17:09:39 -0000	1.18
@@ -309,6 +309,9 @@
 extern W_Icon planet_earth[NUMTEAMS], planet_klingus[NUMTEAMS], planet_orion[NUMTEAMS],
     planet_romulus[NUMTEAMS], planet_agri1[NUMTEAMS], planet_agri2[NUMTEAMS],
     planet_rock1[NUMTEAMS], planet_rock2[NUMTEAMS];
+extern W_Icon army_bitmap;
+extern W_Icon wrench_bitmap;
+extern W_Icon fuel_bitmap;
 extern W_Icon base_planets;
 extern W_Icon base_mplanets;
 extern W_Icon bplanets[PLANET_VIEWS];

Index: proto.h
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/include/proto.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- proto.h	20 May 2006 03:55:23 -0000	1.18
+++ proto.h	20 May 2006 17:09:39 -0000	1.19
@@ -447,6 +447,8 @@
 void initPlanets (void);
 //inline static void checkRedraw(int x, int y);
 extern inline W_Icon planetBitmapC(register struct planet * p);
+extern inline void planetResourcesC (SDBUFFER * sdb, register struct planet *p,
+                                     int destwidth, int destheight, int dx, int dy, W_Window window);
 //static void DrawPlanets();
 void map (void);