Update of /cvsroot/netrek/client/netrekxp/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7081/src
Modified Files:
cowmain.c newwin.c playback.c
Log Message:
Change to bitmap loading procedure as follows:
If any bitmap files in a set are missing, default to the monoscale bitmaps
for that set.
If the monoscale bitmaps are missing, it's the users fault for deleting his/her
bitmap files.
This purpose of this code is preventative, as older versions of the client had
different bitmap directories names and different bitmap sets. If someone were
to use a newer netrek executable without updating the bitmap libraries, this
should keep the client working.
Index: newwin.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/newwin.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- newwin.c 15 Apr 2006 01:04:34 -0000 1.3
+++ newwin.c 16 Apr 2006 10:39:38 -0000 1.4
@@ -13,7 +13,7 @@
#include <math.h>
#include <signal.h>
#include <sys/types.h>
-
+#include <sys/stat.h>
#include <time.h>
#include <winsock.h>
@@ -47,6 +47,25 @@
#define STATSIZE (MESSAGESIZE * 2 + BORDER)
#define YOFF -25
+/******************************************************************************/
+/*** bitmapExists()
+/*** Called by savebitmaps() to verify bitmap files exist. */
+/******************************************************************************/
+int bitmapExists (char * fileName)
+{
+ struct stat buf;
+ char * dir;
+ int i;
+
+ sprintf(dir, "bitmaps/shiplib/");
+ strcat(dir, fileName);
+ i = stat ( dir, &buf );
+
+ if ( i == 0 )
+ return 1;
+ else
+ return 0;
+}
/******************************************************************************/
/*** handleMessageWindowKeyDown()
@@ -349,72 +368,223 @@
break;
}
-/* Load all the bitmaps in. Let the user be able to toggle between
- any type if dynamicBitmaps is set. */
+/*
+ Load all the bitmaps in, so the user can toggle between any type if
+ dynamicBitmaps is set.
+ If any bitmap files in a set are missing, default to the monoscale bitmaps
+ for that set.
+ If the monoscale bitmaps are missing, it's the users fault for deleting his/her
+ bitmap files.
+ This purpose of this code is preventative, as older versions of the client had
+ different bitmap directories names and different bitmap sets. If someone were
+ to use a newer netrek executable without updating the bitmap libraries, this
+ should keep the client working.
+*/
- ship_bitmaps[0] =
- W_StoreBitmap3 (fed_ship_bmp, BMP_SHIP_WIDTH * 8,
- BMP_SHIP_HEIGHT * 32, BMP_FED_SHIP, w,
- LR_DEFAULTCOLOR);
- ship_bitmaps[1] =
- W_StoreBitmap3 (ind_ship_bmp, BMP_SHIP_WIDTH * 8,
- BMP_SHIP_HEIGHT * 32, BMP_IND_SHIP, w,
- LR_DEFAULTCOLOR);
- ship_bitmaps[2] =
- W_StoreBitmap3 (kli_ship_bmp, BMP_SHIP_WIDTH * 8,
- BMP_SHIP_HEIGHT * 32, BMP_KLI_SHIP, w,
- LR_DEFAULTCOLOR);
- ship_bitmaps[3] =
- W_StoreBitmap3 (ori_ship_bmp, BMP_SHIP_WIDTH * 8,
- BMP_SHIP_HEIGHT * 32, BMP_ORI_SHIP, w,
- LR_DEFAULTCOLOR);
- ship_bitmaps[4] =
- W_StoreBitmap3 (rom_ship_bmp, BMP_SHIP_WIDTH * 8,
- BMP_SHIP_HEIGHT * 32, BMP_ROM_SHIP, w,
- LR_DEFAULTCOLOR);
-
- ship_bitmaps1[0] =
- W_StoreBitmap3 (fed_ship_bmp_1, BMP_SHIP_WIDTH * 8,
- BMP_SHIP_HEIGHT * 32, BMP_FED_SHIP, w,
- LR_DEFAULTCOLOR);
- ship_bitmaps1[1] =
- W_StoreBitmap3 (ind_ship_bmp_1, BMP_SHIP_WIDTH * 8,
- BMP_SHIP_HEIGHT * 32, BMP_IND_SHIP, w,
- LR_DEFAULTCOLOR);
- ship_bitmaps1[2] =
- W_StoreBitmap3 (kli_ship_bmp_1, BMP_SHIP_WIDTH * 8,
- BMP_SHIP_HEIGHT * 32, BMP_KLI_SHIP, w,
- LR_DEFAULTCOLOR);
- ship_bitmaps1[3] =
- W_StoreBitmap3 (ori_ship_bmp_1, BMP_SHIP_WIDTH * 8,
- BMP_SHIP_HEIGHT * 32, BMP_ORI_SHIP, w,
- LR_DEFAULTCOLOR);
- ship_bitmaps1[4] =
- W_StoreBitmap3 (rom_ship_bmp_1, BMP_SHIP_WIDTH * 8,
- BMP_SHIP_HEIGHT * 32, BMP_ROM_SHIP, w,
- LR_DEFAULTCOLOR);
-
- ship_bitmapsT[0] =
- W_StoreBitmap3 (fed_ship_bmp_T, BMP_SHIP_WIDTH * 8,
- BMP_SHIP_HEIGHT * 32, BMP_FED_SHIP, w,
- LR_DEFAULTCOLOR);
- ship_bitmapsT[1] =
- W_StoreBitmap3 (ind_ship_bmp_T, BMP_SHIP_WIDTH * 8,
- BMP_SHIP_HEIGHT * 32, BMP_IND_SHIP, w,
- LR_DEFAULTCOLOR);
- ship_bitmapsT[2] =
- W_StoreBitmap3 (kli_ship_bmp_T, BMP_SHIP_WIDTH * 8,
- BMP_SHIP_HEIGHT * 32, BMP_KLI_SHIP, w,
- LR_DEFAULTCOLOR);
- ship_bitmapsT[3] =
- W_StoreBitmap3 (ori_ship_bmp_T, BMP_SHIP_WIDTH * 8,
- BMP_SHIP_HEIGHT * 32, BMP_ORI_SHIP, w,
- LR_DEFAULTCOLOR);
- ship_bitmapsT[4] =
- W_StoreBitmap3 (rom_ship_bmp_T, BMP_SHIP_WIDTH * 8,
- BMP_SHIP_HEIGHT * 32, BMP_ROM_SHIP, w,
- LR_DEFAULTCOLOR);
-
+ if (bitmapExists("fedship.bmp")
+ && bitmapExists("indship.bmp")
+ && bitmapExists("kliship.bmp")
+ && bitmapExists("oriship.bmp")
+ && bitmapExists("romship.bmp"))
+ {
+ ship_bitmaps[0] =
+ W_StoreBitmap3 (fed_ship_bmp, BMP_SHIP_WIDTH * 8,
+ BMP_SHIP_HEIGHT * 32, BMP_FED_SHIP, w,
+ LR_DEFAULTCOLOR);
+ ship_bitmaps[1] =
+ W_StoreBitmap3 (ind_ship_bmp, BMP_SHIP_WIDTH * 8,
+ BMP_SHIP_HEIGHT * 32, BMP_IND_SHIP, w,
+ LR_DEFAULTCOLOR);
+ ship_bitmaps[2] =
+ W_StoreBitmap3 (kli_ship_bmp, BMP_SHIP_WIDTH * 8,
+ BMP_SHIP_HEIGHT * 32, BMP_KLI_SHIP, w,
+ LR_DEFAULTCOLOR);
+ ship_bitmaps[3] =
+ W_StoreBitmap3 (ori_ship_bmp, BMP_SHIP_WIDTH * 8,
+ BMP_SHIP_HEIGHT * 32, BMP_ORI_SHIP, w,
+ LR_DEFAULTCOLOR);
+ ship_bitmaps[4] =
+ W_StoreBitmap3 (rom_ship_bmp, BMP_SHIP_WIDTH * 8,
+ BMP_SHIP_HEIGHT * 32, BMP_ROM_SHIP, w,
+ LR_DEFAULTCOLOR);
+ }
+ else /* default to mono */
+ {
+ ship_bitmaps[0] =
+ W_StoreBitmap3 (fed_ship_bmp_M, BMP_SHIP_WIDTH * 8,
+ BMP_SHIP_HEIGHT * 32, BMP_FED_SHIP, w,
+ LR_MONOCHROME);
+ ship_bitmaps[1] =
+ W_StoreBitmap3 (ind_ship_bmp_M, BMP_SHIP_WIDTH * 8,
+ BMP_SHIP_HEIGHT * 32, BMP_IND_SHIP, w,
+ LR_MONOCHROME);
+ ship_bitmaps[2] =
+ W_StoreBitmap3 (kli_ship_bmp_M, BMP_SHIP_WIDTH * 8,
+ BMP_SHIP_HEIGHT * 32, BMP_KLI_SHIP, w,
+ LR_MONOCHROME);
+ ship_bitmaps[3] =
+ W_StoreBitmap3 (ori_ship_bmp_M, BMP_SHIP_WIDTH * 8,
+ BMP_SHIP_HEIGHT * 32, BMP_ORI_SHIP, w,
+ LR_MONOCHROME);
+ ship_bitmaps[4] =
+ W_StoreBitmap3 (rom_ship_bmp_M, BMP_SHIP_WIDTH * 8,
+ BMP_SHIP_HEIGHT * 32, BMP_ROM_SHIP, w,
+ LR_MONOCHROME);
+ }
+
+ if (bitmapExists("fedship1.bmp")
+ && bitmapExists("indship1.bmp")
+ && bitmapExists("kliship1.bmp")
+ && bitmapExists("oriship1.bmp")
+ && bitmapExists("romship1.bmp"))
+ {
+ ship_bitmaps1[0] =
+ W_StoreBitmap3 (fed_ship_bmp_1, BMP_SHIP_WIDTH * 8,
+ BMP_SHIP_HEIGHT * 32, BMP_FED_SHIP, w,
+ LR_DEFAULTCOLOR);
+ ship_bitmaps1[1] =
+ W_StoreBitmap3 (ind_ship_bmp_1, BMP_SHIP_WIDTH * 8,
+ BMP_SHIP_HEIGHT * 32, BMP_IND_SHIP, w,
+ LR_DEFAULTCOLOR);
+ ship_bitmaps1[2] =
+ W_StoreBitmap3 (kli_ship_bmp_1, BMP_SHIP_WIDTH * 8,
+ BMP_SHIP_HEIGHT * 32, BMP_KLI_SHIP, w,
+ LR_DEFAULTCOLOR);
+ ship_bitmaps1[3] =
+ W_StoreBitmap3 (ori_ship_bmp_1, BMP_SHIP_WIDTH * 8,
+ BMP_SHIP_HEIGHT * 32, BMP_ORI_SHIP, w,
+ LR_DEFAULTCOLOR);
+ ship_bitmaps1[4] =
+ W_StoreBitmap3 (rom_ship_bmp_1, BMP_SHIP_WIDTH * 8,
+ BMP_SHIP_HEIGHT * 32, BMP_ROM_SHIP, w,
+ LR_DEFAULTCOLOR);
+ }
+ else /* default to mono */
+ {
+ ship_bitmaps1[0] =
+ W_StoreBitmap3 (fed_ship_bmp_M, BMP_SHIP_WIDTH * 8,
+ BMP_SHIP_HEIGHT * 32, BMP_FED_SHIP, w,
+ LR_MONOCHROME);
+ ship_bitmaps1[1] =
+ W_StoreBitmap3 (ind_ship_bmp_M, BMP_SHIP_WIDTH * 8,
+ BMP_SHIP_HEIGHT * 32, BMP_IND_SHIP, w,
+ LR_MONOCHROME);
+ ship_bitmaps1[2] =
+ W_StoreBitmap3 (kli_ship_bmp_M, BMP_SHIP_WIDTH * 8,
+ BMP_SHIP_HEIGHT * 32, BMP_KLI_SHIP, w,
+ LR_MONOCHROME);
+ ship_bitmaps1[3] =
+ W_StoreBitmap3 (ori_ship_bmp_M, BMP_SHIP_WIDTH * 8,
+ BMP_SHIP_HEIGHT * 32, BMP_ORI_SHIP, w,
+ LR_MONOCHROME);
+ ship_bitmaps1[4] =
+ W_StoreBitmap3 (rom_ship_bmp_M, BMP_SHIP_WIDTH * 8,
+ BMP_SHIP_HEIGHT * 32, BMP_ROM_SHIP, w,
+ LR_MONOCHROME);
+ }
+
+ if (bitmapExists("fedshipT.bmp")
+ && bitmapExists("indshipT.bmp")
+ && bitmapExists("klishipT.bmp")
+ && bitmapExists("orishipT.bmp")
+ && bitmapExists("romshipT.bmp"))
+ {
+ ship_bitmapsT[0] =
+ W_StoreBitmap3 (fed_ship_bmp_T, BMP_SHIP_WIDTH * 8,
+ BMP_SHIP_HEIGHT * 32, BMP_FED_SHIP, w,
+ LR_DEFAULTCOLOR);
+ ship_bitmapsT[1] =
+ W_StoreBitmap3 (ind_ship_bmp_T, BMP_SHIP_WIDTH * 8,
+ BMP_SHIP_HEIGHT * 32, BMP_IND_SHIP, w,
+ LR_DEFAULTCOLOR);
+ ship_bitmapsT[2] =
+ W_StoreBitmap3 (kli_ship_bmp_T, BMP_SHIP_WIDTH * 8,
+ BMP_SHIP_HEIGHT * 32, BMP_KLI_SHIP, w,
+ LR_DEFAULTCOLOR);
+ ship_bitmapsT[3] =
+ W_StoreBitmap3 (ori_ship_bmp_T, BMP_SHIP_WIDTH * 8,
+ BMP_SHIP_HEIGHT * 32, BMP_ORI_SHIP, w,
+ LR_DEFAULTCOLOR);
+ ship_bitmapsT[4] =
+ W_StoreBitmap3 (rom_ship_bmp_T, BMP_SHIP_WIDTH * 8,
+ BMP_SHIP_HEIGHT * 32, BMP_ROM_SHIP, w,
+ LR_DEFAULTCOLOR);
+ }
+ else /* default to mono */
+ {
+ ship_bitmapsT[0] =
+ W_StoreBitmap3 (fed_ship_bmp_M, BMP_SHIP_WIDTH * 8,
+ BMP_SHIP_HEIGHT * 32, BMP_FED_SHIP, w,
+ LR_MONOCHROME);
+ ship_bitmapsT[1] =
+ W_StoreBitmap3 (ind_ship_bmp_M, BMP_SHIP_WIDTH * 8,
+ BMP_SHIP_HEIGHT * 32, BMP_IND_SHIP, w,
+ LR_MONOCHROME);
+ ship_bitmapsT[2] =
+ W_StoreBitmap3 (kli_ship_bmp_M, BMP_SHIP_WIDTH * 8,
+ BMP_SHIP_HEIGHT * 32, BMP_KLI_SHIP, w,
+ LR_MONOCHROME);
+ ship_bitmapsT[3] =
+ W_StoreBitmap3 (ori_ship_bmp_M, BMP_SHIP_WIDTH * 8,
+ BMP_SHIP_HEIGHT * 32, BMP_ORI_SHIP, w,
+ LR_MONOCHROME);
+ ship_bitmapsT[4] =
+ W_StoreBitmap3 (rom_ship_bmp_M, BMP_SHIP_WIDTH * 8,
+ BMP_SHIP_HEIGHT * 32, BMP_ROM_SHIP, w,
+ LR_MONOCHROME);
+ }
+
+ if (bitmapExists("fedshipG.bmp")
+ && bitmapExists("indshipG.bmp")
+ && bitmapExists("klishipG.bmp")
+ && bitmapExists("orishipG.bmp")
+ && bitmapExists("romshipG.bmp"))
+ {
+ ship_bitmapsG[0] =
+ W_StoreBitmap3 (fed_ship_bmp_G, BMP_SHIP_WIDTH * 8,
+ BMP_SHIP_HEIGHT * 32, BMP_FED_SHIP, w,
+ LR_DEFAULTCOLOR);
+ ship_bitmapsG[1] =
+ W_StoreBitmap3 (ind_ship_bmp_G, BMP_SHIP_WIDTH * 8,
+ BMP_SHIP_HEIGHT * 32, BMP_IND_SHIP, w,
+ LR_DEFAULTCOLOR);
+ ship_bitmapsG[2] =
+ W_StoreBitmap3 (kli_ship_bmp_G, BMP_SHIP_WIDTH * 8,
+ BMP_SHIP_HEIGHT * 32, BMP_KLI_SHIP, w,
+ LR_DEFAULTCOLOR);
+ ship_bitmapsG[3] =
+ W_StoreBitmap3 (ori_ship_bmp_G, BMP_SHIP_WIDTH * 8,
+ BMP_SHIP_HEIGHT * 32, BMP_ORI_SHIP, w,
+ LR_DEFAULTCOLOR);
+ ship_bitmapsG[4] =
+ W_StoreBitmap3 (rom_ship_bmp_G, BMP_SHIP_WIDTH * 8,
+ BMP_SHIP_HEIGHT * 32, BMP_ROM_SHIP, w,
+ LR_DEFAULTCOLOR);
+ }
+ else /* default to mono */
+ {
+ ship_bitmapsG[0] =
+ W_StoreBitmap3 (fed_ship_bmp_M, BMP_SHIP_WIDTH * 8,
+ BMP_SHIP_HEIGHT * 32, BMP_FED_SHIP, w,
+ LR_MONOCHROME);
+ ship_bitmapsG[1] =
+ W_StoreBitmap3 (ind_ship_bmp_M, BMP_SHIP_WIDTH * 8,
+ BMP_SHIP_HEIGHT * 32, BMP_IND_SHIP, w,
+ LR_MONOCHROME);
+ ship_bitmapsG[2] =
+ W_StoreBitmap3 (kli_ship_bmp_M, BMP_SHIP_WIDTH * 8,
+ BMP_SHIP_HEIGHT * 32, BMP_KLI_SHIP, w,
+ LR_MONOCHROME);
+ ship_bitmapsG[3] =
+ W_StoreBitmap3 (ori_ship_bmp_M, BMP_SHIP_WIDTH * 8,
+ BMP_SHIP_HEIGHT * 32, BMP_ORI_SHIP, w,
+ LR_MONOCHROME);
+ ship_bitmapsG[4] =
+ W_StoreBitmap3 (rom_ship_bmp_M, BMP_SHIP_WIDTH * 8,
+ BMP_SHIP_HEIGHT * 32, BMP_ROM_SHIP, w,
+ LR_MONOCHROME);
+ }
+
ship_bitmapsM[0] =
W_StoreBitmap3 (fed_ship_bmp_M, BMP_SHIP_WIDTH * 8,
BMP_SHIP_HEIGHT * 32, BMP_FED_SHIP, w,
@@ -435,27 +605,6 @@
W_StoreBitmap3 (rom_ship_bmp_M, BMP_SHIP_WIDTH * 8,
BMP_SHIP_HEIGHT * 32, BMP_ROM_SHIP, w,
LR_MONOCHROME);
-
- ship_bitmapsG[0] =
- W_StoreBitmap3 (fed_ship_bmp_G, BMP_SHIP_WIDTH * 8,
- BMP_SHIP_HEIGHT * 32, BMP_FED_SHIP, w,
- LR_DEFAULTCOLOR);
- ship_bitmapsG[1] =
- W_StoreBitmap3 (ind_ship_bmp_G, BMP_SHIP_WIDTH * 8,
- BMP_SHIP_HEIGHT * 32, BMP_IND_SHIP, w,
- LR_DEFAULTCOLOR);
- ship_bitmapsG[2] =
- W_StoreBitmap3 (kli_ship_bmp_G, BMP_SHIP_WIDTH * 8,
- BMP_SHIP_HEIGHT * 32, BMP_KLI_SHIP, w,
- LR_DEFAULTCOLOR);
- ship_bitmapsG[3] =
- W_StoreBitmap3 (ori_ship_bmp_G, BMP_SHIP_WIDTH * 8,
- BMP_SHIP_HEIGHT * 32, BMP_ORI_SHIP, w,
- LR_DEFAULTCOLOR);
- ship_bitmapsG[4] =
- W_StoreBitmap3 (rom_ship_bmp_G, BMP_SHIP_WIDTH * 8,
- BMP_SHIP_HEIGHT * 32, BMP_ROM_SHIP, w,
- LR_DEFAULTCOLOR);
for (j = 0; j < NUM_TYPES; j++)
{
Index: cowmain.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/cowmain.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- cowmain.c 15 Apr 2006 01:04:34 -0000 1.3
+++ cowmain.c 16 Apr 2006 10:39:38 -0000 1.4
@@ -44,7 +44,6 @@
extern int log_packets;
#endif
-
#ifdef GATEWAY
/*-----------------------------------------------------------*/
@@ -658,10 +657,10 @@
fed_ship_bmp = "bitmaps/shiplib/fedship.bmp";
if ((stringDefault ("fedshipbmpfile")) != NULL)
fed_ship_bmp = stringDefault ("fedshipbmpfile");
-
+
fed_ship_bmp_1 = "bitmaps/shiplib/fedship1.bmp";
- if ((stringDefault ("fedshipbmp1file")) != NULL)
- fed_ship_bmp_1 = stringDefault ("fedshipbmp1file");
+ if ((stringDefault ("fedship1bmpfile")) != NULL)
+ fed_ship_bmp_1 = stringDefault ("fedship1bmpfile");
fed_ship_bmp_G = "bitmaps/shiplib/fedshipG.bmp";
if ((stringDefault ("fedshipGbmpfile")) != NULL)
@@ -680,8 +679,8 @@
rom_ship_bmp = stringDefault ("romshipbmpfile");
rom_ship_bmp_1 = "bitmaps/shiplib/romship1.bmp";
- if ((stringDefault ("romshipbmp1file")) != NULL)
- rom_ship_bmp_1 = stringDefault ("romshipbmp1file");
+ if ((stringDefault ("romship1bmpfile")) != NULL)
+ rom_ship_bmp_1 = stringDefault ("romship1bmpfile");
rom_ship_bmp_G = "bitmaps/shiplib/romshipG.bmp";
if ((stringDefault ("romshipGbmpfile")) != NULL)
@@ -700,8 +699,8 @@
kli_ship_bmp = stringDefault ("klishipbmpfile");
kli_ship_bmp_1 = "bitmaps/shiplib/kliship1.bmp";
- if ((stringDefault ("klishipbmp1file")) != NULL)
- kli_ship_bmp_1 = stringDefault ("klishipbmp1file");
+ if ((stringDefault ("kliship1bmpfile")) != NULL)
+ kli_ship_bmp_1 = stringDefault ("kliship1bmpfile");
kli_ship_bmp_G = "bitmaps/shiplib/klishipG.bmp";
if ((stringDefault ("klishipGbmpfile")) != NULL)
@@ -720,8 +719,8 @@
ori_ship_bmp = stringDefault ("orishipbmpfile");
ori_ship_bmp_1 = "bitmaps/shiplib/oriship1.bmp";
- if ((stringDefault ("orishipbmp1file")) != NULL)
- ori_ship_bmp_1 = stringDefault ("orishipbmp1file");
+ if ((stringDefault ("oriship1bmpfile")) != NULL)
+ ori_ship_bmp_1 = stringDefault ("oriship1bmpfile");
ori_ship_bmp_G = "bitmaps/shiplib/orishipG.bmp";
if ((stringDefault ("orishipGbmpfile")) != NULL)
@@ -740,8 +739,8 @@
ind_ship_bmp = stringDefault ("indshipbmpfile");
ind_ship_bmp_1 = "bitmaps/shiplib/indship1.bmp";
- if ((stringDefault ("indshipbmp1file")) != NULL)
- ind_ship_bmp_1 = stringDefault ("indshipbmp1file");
+ if ((stringDefault ("indship1bmpfile")) != NULL)
+ ind_ship_bmp_1 = stringDefault ("indship1bmpfile");
ind_ship_bmp_G = "bitmaps/shiplib/indshipG.bmp";
if ((stringDefault ("indshipGbmpfile")) != NULL)
Index: playback.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/playback.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- playback.c 15 Apr 2006 01:04:34 -0000 1.3
+++ playback.c 16 Apr 2006 10:39:38 -0000 1.4
@@ -80,8 +80,8 @@
fed_ship_bmp = stringDefault ("fedshipbmpfile");
fed_ship_bmp_1 = "bitmaps/shiplib/fedship1.bmp";
- if ((stringDefault ("fedshipbmp1file")) != NULL)
- fed_ship_bmp_1 = stringDefault ("fedshipbmp1file");
+ if ((stringDefault ("fedship1bmpfile")) != NULL)
+ fed_ship_bmp_1 = stringDefault ("fedship1bmpfile");
fed_ship_bmp_G = "bitmaps/shiplib/fedshipG.bmp";
if ((stringDefault ("fedshipGbmpfile")) != NULL)
@@ -100,8 +100,8 @@
rom_ship_bmp = stringDefault ("romshipbmpfile");
rom_ship_bmp_1 = "bitmaps/shiplib/romship1.bmp";
- if ((stringDefault ("romshipbmp1file")) != NULL)
- rom_ship_bmp_1 = stringDefault ("romshipbmp1file");
+ if ((stringDefault ("romship1bmpfile")) != NULL)
+ rom_ship_bmp_1 = stringDefault ("romship1bmpfile");
rom_ship_bmp_G = "bitmaps/shiplib/romshipG.bmp";
if ((stringDefault ("romshipGbmpfile")) != NULL)
@@ -120,8 +120,8 @@
kli_ship_bmp = stringDefault ("klishipbmpfile");
kli_ship_bmp_1 = "bitmaps/shiplib/kliship1.bmp";
- if ((stringDefault ("klishipbmp1file")) != NULL)
- kli_ship_bmp_1 = stringDefault ("klishipbmp1file");
+ if ((stringDefault ("kliship1bmpfile")) != NULL)
+ kli_ship_bmp_1 = stringDefault ("kliship1bmpfile");
kli_ship_bmp_G = "bitmaps/shiplib/klishipG.bmp";
if ((stringDefault ("klishipGbmpfile")) != NULL)
@@ -140,8 +140,8 @@
ori_ship_bmp = stringDefault ("orishipbmpfile");
ori_ship_bmp_1 = "bitmaps/shiplib/oriship1.bmp";
- if ((stringDefault ("orishipbmp1file")) != NULL)
- ori_ship_bmp_1 = stringDefault ("orishipbmp1file");
+ if ((stringDefault ("oriship1bmpfile")) != NULL)
+ ori_ship_bmp_1 = stringDefault ("oriship1bmpfile");
ori_ship_bmp_G = "bitmaps/shiplib/orishipG.bmp";
if ((stringDefault ("orishipGbmpfile")) != NULL)
@@ -160,8 +160,8 @@
ind_ship_bmp = stringDefault ("indshipbmpfile");
ind_ship_bmp_1 = "bitmaps/shiplib/indship1.bmp";
- if ((stringDefault ("indshipbmp1file")) != NULL)
- ind_ship_bmp_1 = stringDefault ("indshipbmp1file");
+ if ((stringDefault ("indship1bmpfile")) != NULL)
+ ind_ship_bmp_1 = stringDefault ("indship1bmpfile");
ind_ship_bmp_G = "bitmaps/shiplib/indshipG.bmp";
if ((stringDefault ("indshipGbmpfile")) != NULL)