Update of /cvsroot/netrek/client/netrekxp/src
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv28198/src

Modified Files:
	data.c defaults.c defwin.c local.c mswindow.c newwin.c 
	option.c 
Log Message:
Remove VSHIELD_BITMAPS define.

Index: mswindow.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/mswindow.c,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -d -r1.95 -r1.96
--- mswindow.c	9 Jun 2009 01:04:33 -0000	1.95
+++ mswindow.c	9 Jun 2009 01:23:01 -0000	1.96
@@ -566,14 +566,8 @@
         free (expview[i]);
     for (i = 0; i < BMP_SBEXPL_FRAMES; i++)
         free (sbexpview[i]);
-
-#ifdef VSHIELD_BITMAPS
     for (i = 0; i < SHIELD_FRAMES; i++)
         free (shield[i]);
-#else
-    free (shield);
-#endif
-
     for (i = 0; i < BMP_HULL_FRAMES; i++)
         free (hull[i]);
 

Index: newwin.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/newwin.c,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -d -r1.80 -r1.81
--- newwin.c	9 Jun 2009 00:16:36 -0000	1.80
+++ newwin.c	9 Jun 2009 01:23:01 -0000	1.81
@@ -1502,12 +1502,6 @@
             W_PointBitmap2 (base_sbexpview, 0, i, BMP_SBEXPL_WIDTH,
                             BMP_SBEXPL_HEIGHT);
     }
-
-#ifndef VSHIELD_BITMAPS
-    shield =
-        W_StoreBitmap3 ("bitmaps/misclib/shield.bmp", BMP_SHIELD_WIDTH,
-                        BMP_SHIELD_HEIGHT, BMP_SHIELD, w, LR_MONOCHROME);
-#else
     base_vshield =
         W_StoreBitmap3 ("bitmaps/misclib/vshield.bmp", BMP_SHIELD_WIDTH,
                         BMP_SHIELD_HEIGHT * SHIELD_FRAMES, BMP_SHIELD, w,
@@ -1515,7 +1509,6 @@
     for (i = 0; i < SHIELD_FRAMES; i++)
         shield[i] =
             W_PointBitmap2 (base_vshield, 0, i, BMP_SHIELD_WIDTH, BMP_SHIELD_HEIGHT);
-#endif
 
     base_hull =
         W_StoreBitmap3 ("bitmaps/misclib/varyhull.bmp", hull_width,

Index: local.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/local.c,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -d -r1.120 -r1.121
--- local.c	9 Jun 2009 00:28:10 -0000	1.120
+++ local.c	9 Jun 2009 01:23:01 -0000	1.121
@@ -1295,7 +1295,6 @@
             {
                 int color = playerColor (j);
 
-#ifdef VSHIELD_BITMAPS
                 int shieldnum;
 
                 if (isMe(j) && varyShields)
@@ -1321,7 +1320,6 @@
                 }
                 else
                     color = playerColor (j);
-#endif
 
                 if (warnShields && isMe(j))
                 {
@@ -1339,7 +1337,6 @@
                     }
                 }
 
-#ifdef VSHIELD_BITMAPS
                 W_WriteScaleBitmap (dx - (BMP_SHIELD_WIDTH / 2) * SCALE / scaleFactor,
                                     dy - (BMP_SHIELD_HEIGHT / 2) * SCALE / scaleFactor,
                                     BMP_SHIELD_WIDTH * SCALE / scaleFactor,
@@ -1347,15 +1344,6 @@
                                     BMP_SHIELD_WIDTH,
                                     BMP_SHIELD_HEIGHT,
                                     0, shield[shieldnum], color, w);
-#else
-                W_WriteScaleBitmap (dx - (BMP_SHIELD_WIDTH / 2) * SCALE / scaleFactor,
-                                    dy - (BMP_SHIELD_HEIGHT / 2) * SCALE / scaleFactor,
-                                    BMP_SHIELD_WIDTH * SCALE / scaleFactor,
-                                    BMP_SHIELD_HEIGHT * SCALE / scaleFactor,
-                                    BMP_SHIELD_WIDTH,
-                                    BMP_SHIELD_HEIGHT,
-                                    0, shield, color, w);
-#endif
             }
             /* Warning hull */
             if (vary_hull)

Index: defaults.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/defaults.c,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -d -r1.104 -r1.105
--- defaults.c	9 Jun 2009 01:04:33 -0000	1.104
+++ defaults.c	9 Jun 2009 01:23:01 -0000	1.105
@@ -966,7 +966,6 @@
         }
     },
 #endif
-#ifdef VSHIELD_BITMAPS
     {"varyShields", &varyShields, RC_BOOL,
         {
             "Change shields graphic on shield damage",
@@ -979,7 +978,6 @@
             NULL
         }
     },
-#endif
     {"viewBox", &viewBox, RC_BOOL,
         {
             "Show limits of tactical display on galaxy",
@@ -1808,10 +1806,8 @@
 
     windowMove = booleanDefault ("windowMove", windowMove);
 
-#ifdef VSHIELD_BITMAPS
     varyShields = booleanDefault ("varyShields", varyShields);
     varyShieldsColor = booleanDefault ("varyShieldsColor", varyShieldsColor);
-#endif
 
     warnShields = booleanDefault ("warnShields", warnShields);
     vary_hull = booleanDefault("warnHull", vary_hull);

Index: data.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/data.c,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -d -r1.130 -r1.131
--- data.c	9 Jun 2009 01:04:33 -0000	1.130
+++ data.c	9 Jun 2009 01:23:01 -0000	1.131
@@ -327,17 +327,11 @@
 W_Icon etorp, mtorp;
 W_Icon eplasmatorp, mplasmatorp;
 
-#ifdef VSHIELD_BITMAPS
 W_Icon base_vshield;
 W_Icon shield[SHIELD_FRAMES], cloakicon;
 int varyShields = 1;
 int varyShieldsColor = 1;
 
-#else
-W_Icon shield, cloakicon;
-
-#endif
-
 W_Icon base_hull;
 W_Icon hull[BMP_HULL_FRAMES];
 int vary_hull = 0;

Index: defwin.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/defwin.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- defwin.c	8 Jun 2009 22:55:03 -0000	1.8
+++ defwin.c	9 Jun 2009 01:23:01 -0000	1.9
@@ -347,7 +347,6 @@
         ,}
     ,}
     ,
-#ifdef VSHIELD_BITMAPS
     {
         "varyShields", BOOL_DEF, "Vary shields based on damage",
             &varyShields,
@@ -357,7 +356,6 @@
         ,}
     ,}
     ,
-#endif
     {
         "warnShields", BOOL_DEF, "Shield color based on alert status",
             &warnShields,

Index: option.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/option.c,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -d -r1.62 -r1.63
--- option.c	9 Jun 2009 00:28:10 -0000	1.62
+++ option.c	9 Jun 2009 01:23:01 -0000	1.63
@@ -274,10 +274,8 @@
     {1, "Page %d (click to change)", &MenuPage, 0, 0, 0, NULL, &Menus_Range},
     {1, "", &colorClient, 0, 0, 0, bitmaptypemess, &bitmap_range},
     {1, "draw ships to 256 positions", &fullBitmapRotation, 0, 0, 0, NULL, NULL},
-#ifdef VSHIELD_BITMAPS
     {1, "vary shields bitmap w/ dam", &varyShields, 0, 0, 0, NULL, NULL},
     {1, "vary shields color w/ dam", &varyShieldsColor, 0, 0, 0, NULL, NULL},
-#endif
     {1, "use warning shields", &warnShields, 0, 0, 0, NULL, NULL},
     {1, "use warning hull", &vary_hull, 0, 0, 0, NULL, NULL},
     {1, "show my speed on local", &showMySpeed, 0, 0, 0, NULL, NULL},