Update of /cvsroot/netrek/client/netrekxp/include
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv28198/include
Modified Files:
data.h oldbitmaps.h
Log Message:
Remove VSHIELD_BITMAPS define.
Index: data.h
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/include/data.h,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -d -r1.118 -r1.119
--- data.h 9 Jun 2009 01:04:33 -0000 1.118
+++ data.h 9 Jun 2009 01:23:01 -0000 1.119
@@ -317,18 +317,12 @@
extern W_Icon etorp, mtorp;
extern W_Icon eplasmatorp, mplasmatorp;
-#ifdef VSHIELD_BITMAPS
#define SHIELD_FRAMES 5
extern W_Icon base_vshield;
extern W_Icon shield[SHIELD_FRAMES], cloakicon;
extern int varyShields;
extern int varyShieldsColor;
-#else
-extern W_Icon shield, cloakicon;
-
-#endif
-
extern W_Icon base_hull;
extern W_Icon hull[BMP_HULL_FRAMES];
extern int vary_hull;
Index: oldbitmaps.h
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/include/oldbitmaps.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- oldbitmaps.h 21 Jan 2003 21:27:54 -0000 1.1.1.1
+++ oldbitmaps.h 9 Jun 2009 01:23:01 -0000 1.2
@@ -1,4 +1,3 @@
-#ifdef VSHIELD_BITMAPS
#define shield_width 20
#define shield_height 20
#define SHIELD_FRAMES 5
@@ -37,17 +36,6 @@
0x0c, 0x00, 0x03, 0x18, 0x80, 0x01, 0x70, 0xe0, 0x00, 0xc0, 0x3f, 0x00},
};
-#else
-static char shield_bits[] = {
- 0xc0, 0x3f, 0x00, 0x30, 0xc0, 0x00, 0x08, 0x00, 0x01, 0x04, 0x00, 0x02,
- 0x02, 0x00, 0x04, 0x02, 0x00, 0x04, 0x01, 0x00, 0x08, 0x01, 0x00, 0x08,
- 0x01, 0x00, 0x08, 0x01, 0x00, 0x08, 0x01, 0x00, 0x08, 0x01, 0x00, 0x08,
- 0x01, 0x00, 0x08, 0x01, 0x00, 0x08, 0x02, 0x00, 0x04, 0x02, 0x00, 0x04,
- 0x04, 0x00, 0x02, 0x08, 0x00, 0x01, 0x30, 0xc0, 0x00, 0xc0, 0x3f, 0x00
-};
-
-#endif
-
static char cloak_bits[] = {
0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0x10, 0x40, 0x00, 0x08, 0x82, 0x00,