Update of /cvsroot/netrek/client/netrekxp/src
In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv23519/src
Modified Files:
map.c mswindow.c
Log Message:
Reverted to old font resource calls due to it breaking client on Win98 and earlier.
Slight fixes to refresh zones for new planet bitmaps.
Compile fix for BCC (doesn't like header files defined halfway through a file).
New README file for Win 95/98/ME users, explaining what options not to use
as they won't work right.
Index: mswindow.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/mswindow.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- mswindow.c 28 May 2006 23:05:12 -0000 1.28
+++ mswindow.c 31 May 2006 03:59:27 -0000 1.29
@@ -444,8 +444,9 @@
strcpy (FileName, GetExeDir ());
strcat (FileName, FontFileName);
- RemoveFontResourceEx (FileName, FR_PRIVATE | FR_NOT_ENUM, 0);
-
+// Breaks client in Windows 95, 98, and possibly ME
+// RemoveFontResourceEx (FileName, FR_PRIVATE | FR_NOT_ENUM, 0);
+ RemoveFontResource (FileName);
//Select the original bitmaps back and delete our memory DCs
SelectObject (GlobalMemDC, GlobalOldMemDCBitmap);
DeleteDC (GlobalMemDC);
@@ -766,8 +767,9 @@
//Create the fonts that we need. The fonts are actually in our resource file
strcpy (FileName, GetExeDir ());
strcat (FileName, FontFileName);
- AddFontResourceEx (FileName, FR_PRIVATE | FR_NOT_ENUM, 0);
-
+// Breaks client in Windows 95, 98, and possibly ME
+// AddFontResourceEx (FileName, FR_PRIVATE | FR_NOT_ENUM, 0);
+ AddFontResource (FileName);
memset (&lf, 0, sizeof (LOGFONT));
lf.lfCharSet = ANSI_CHARSET;
Index: map.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/map.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- map.c 30 May 2006 01:10:36 -0000 1.15
+++ map.c 31 May 2006 03:59:27 -0000 1.16
@@ -430,9 +430,9 @@
/* XFIX */
if (planetBitmapGalaxy == 3) // Needs adjusting
- W_ClearArea (mapw, odx - 7 * BMP_MPLANET_WIDTH / 8,
+ W_ClearArea (mapw, odx - 7 * BMP_MPLANET_WIDTH / 8 - 1,
ody - (5 * BMP_MPLANET_HEIGHT / 6),
- 7 * BMP_MPLANET_WIDTH / 4 + 2, 4 * BMP_MPLANET_HEIGHT / 3 + 2);
+ 7 * BMP_MPLANET_WIDTH / 4, 4 * BMP_MPLANET_HEIGHT / 3);
else
W_ClearArea (mapw, odx - (BMP_MPLANET_WIDTH / 2),
ody - (BMP_MPLANET_HEIGHT / 2),
@@ -448,9 +448,9 @@
/* XFIX */
if (planetBitmapGalaxy == 3) // Needs adjusting
- W_ClearArea (mapw, dx - 7 * BMP_MPLANET_WIDTH / 8,
- dy - (5 * BMP_MPLANET_HEIGHT / 6),
- 7 * BMP_MPLANET_WIDTH / 4 + 1, 4 * BMP_MPLANET_HEIGHT / 3 + 1);
+ W_ClearArea (mapw, dx - 7 * BMP_MPLANET_WIDTH / 8 - 5,
+ dy - (5 * BMP_MPLANET_HEIGHT / 6) - 4,
+ 7 * BMP_MPLANET_WIDTH / 4 + 8, 4 * BMP_MPLANET_HEIGHT / 3 + 8);
else
W_ClearArea (mapw, dx - (BMP_MPLANET_WIDTH / 2 + 4),