[netrek-cvs] client/netrekxp/include data.h, 1.19, 1.20 proto.h, 1.20, 1.21

[Bill Balcerski]

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

Modified Files:
	data.h proto.h 
Log Message:
Removed the constant border refresh - trying to cut down on cpu usage.
Loaded planet bitmaps into both local and map icon bitmap structures, for more efficient drawing.

Index: data.h
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/include/data.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- data.h	21 May 2006 09:56:38 -0000	1.19
+++ data.h	21 May 2006 18:53:03 -0000	1.20
@@ -306,14 +306,17 @@
     ori_bitmapsHR[NUM_TYPES], ind_bitmapsHR[NUM_TYPES];
 
 // Planets
-extern W_Icon planet_unknown;
-extern W_Icon planet_bitmaps[8];
+extern W_Icon planet_unknown, 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],
     planet_rock1[NUMTEAMS], planet_rock2[NUMTEAMS];
-extern W_Icon army_bitmap;
-extern W_Icon wrench_bitmap;
-extern W_Icon fuel_bitmap;
+extern W_Icon mplanet_earth[NUMTEAMS], mplanet_klingus[NUMTEAMS], mplanet_orion[NUMTEAMS],
+    mplanet_romulus[NUMTEAMS], mplanet_agri1[NUMTEAMS], mplanet_agri2[NUMTEAMS],
+    mplanet_rock1[NUMTEAMS], mplanet_rock2[NUMTEAMS];
+extern W_Icon army_bitmap, marmy_bitmap;
+extern W_Icon wrench_bitmap, mwrench_bitmap;
+extern W_Icon fuel_bitmap, mfuel_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.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- proto.h	21 May 2006 09:56:38 -0000	1.20
+++ proto.h	21 May 2006 18:53:03 -0000	1.21
@@ -417,6 +417,9 @@
 /***  local.c
 /******************************************************************************/
 void initStars (void);
+static inline W_Icon planetBitmapC(register struct planet * p);
+static inline void planetResourcesC (register struct planet *p, int destwidth,
+                                     int destheight, int dx, int dy, W_Window window);
 //static void DrawPlanets(void);
 //static void DrawShips(void);
 //static void DrawTorps(void);
@@ -446,9 +449,9 @@
 /******************************************************************************/
 void initPlanets (void);
 //inline static void checkRedraw(int x, int y);
-extern inline W_Icon planetBitmapC(register struct planet * p);
-extern inline void planetResourcesC (register struct planet *p, int destwidth,
-                                     int destheight, int dx, int dy, W_Window window);
+static inline W_Icon mplanetBitmapC(register struct planet * p);
+static inline void mplanetResourcesC (register struct planet *p, int destwidth,
+                                      int destheight, int dx, int dy, W_Window window);
 //static void DrawPlanets();
 void map (void);