[netrek-cvs] client/netrekxp/include bitmaps.h, 1.8, 1.9 data.h, 1.14, 1.15 proto.h, 1.14, 1.15 wlib.h, 1.5, 1.6

[Bill Balcerski]

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

Modified Files:
	bitmaps.h data.h proto.h wlib.h 
Log Message:
Addition of core flag to planet info and planet menu.
New quit window stuff.
More work on planet bitmaps and draw functions.

Index: wlib.h
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/include/wlib.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- wlib.h	14 May 2006 02:14:54 -0000	1.5
+++ wlib.h	16 May 2006 05:10:13 -0000	1.6
@@ -212,6 +212,7 @@
                                   int,
                                   int,
                                   int,
+                                  int,
                                   W_Icon,
                                   W_Color,
                                   W_Window);

Index: bitmaps.h
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/include/bitmaps.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- bitmaps.h	14 May 2006 02:14:54 -0000	1.8
+++ bitmaps.h	16 May 2006 05:10:13 -0000	1.9
@@ -77,7 +77,8 @@
 #define BMP_SHIP_EXPLOSION 8
 #define BMP_SB_EXPLOSION 1
 #define BMP_CLOCK 13
-#define BMP_CLOAK 14
+#define BMP_CLOCKHAND 14
+#define BMP_CLOAK 15
 #define BMP_SHIELD 16
 #define BMP_VSHIELD 17
 #define BMP_STIPPLE 22
@@ -93,6 +94,10 @@
 
 #define BMP_CLOCK_WIDTH 48
 #define BMP_CLOCK_HEIGHT 48
+#define BMP_CHAND_WIDTH 100
+#define BMP_CHAND_HEIGHT 100
+#define BMP_CCLOCK_WIDTH 100
+#define BMP_CCLOCK_HEIGHT 100
 #define BMP_CLOAK_WIDTH 20
 #define BMP_CLOAK_HEIGHT 20
 #define BMP_SHIELD_WIDTH 20

Index: data.h
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/include/data.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- data.h	14 May 2006 02:14:54 -0000	1.14
+++ data.h	16 May 2006 05:10:13 -0000	1.15
@@ -233,7 +233,7 @@
 
 extern double Sin[], Cos[];
 
-extern W_Icon stipple, clockpic, genopic;
+extern W_Icon stipple, clockpic, clockhandpic, genopic;
 
 extern W_Icon base_expview;
 extern W_Icon expview[BMP_SHIPEXPL_FRAMES];
@@ -644,7 +644,7 @@
 extern WNDPROC lpfnDefRichEditWndProc;  /* default window procedure for our richedit controls */
 
 extern int richText;    /* temporary variable to enable/disable rich text windows */
-
+extern int newQuit;
 extern int newSound;	/* Use new SDL sound interface */
 extern int newSoundAngles; /* Use SDL with angular 3D sound */
 #endif /* _h_data */

Index: proto.h
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/include/proto.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- proto.h	14 May 2006 02:14:54 -0000	1.14
+++ proto.h	16 May 2006 05:10:13 -0000	1.15
@@ -719,6 +719,7 @@
                            int destheight,
                            int srcwidth,
                            int srcheight,
+                           int angle,
                            W_Icon icon,
                            W_Color color,
                            W_Window window);
@@ -776,7 +777,8 @@
 void W_WriteBitmapGreyDB (SDBUFFER * sdb, int x, int y, W_Icon icon, W_Color color);
 void W_OverlayBitmapDB (SDBUFFER * sdb, int x, int y, W_Icon icon, W_Color color);
 void W_OverlayScaleBitmapDB (SDBUFFER * sdb, int x, int y, int destwidth, int destheight,
-                             int srcwidth, int srcheight, W_Icon icon, W_Color color, W_Window window);
+                             int srcwidth, int srcheight, int angle,
+                             W_Icon icon, W_Color color, W_Window window);
 #endif
 
 /******************************************************************************/