Update of /cvsroot/netrek/client/netrekxp/src
In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv30011/src
Modified Files:
data.c mswindow.c
Log Message:
Changed newQuit from default on to off
Fixed a few bugs in scaled bitmap writing function, has the added bonus of making
the new planet bitmaps work in Win95/98/ME
Fixed typo in metaserver2 name
Index: mswindow.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/mswindow.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- mswindow.c 3 Jun 2006 07:03:42 -0000 1.31
+++ mswindow.c 6 Jun 2006 08:23:06 -0000 1.32
@@ -4000,7 +4000,7 @@
// Copy selected section of main bitmap into newbmp before rotation
SetStretchBltMode(GlobalMemDC2, COLORONCOLOR);
StretchBlt(GlobalMemDC2, 0, 0, destwidth, destheight, GlobalMemDC,
- srcx, srcy, srcwidth, srcheight, SRCPAINT);
+ srcx, srcy, srcwidth, srcheight, SRCCOPY);
//Fast (I hope) rectangle intersection, don't overwrite our borders
if (usebitmaphwnd)
@@ -4126,7 +4126,7 @@
BitBlt(hdc, x, y, newwidth, newheight, GlobalMemDC2, srcx, srcy, SRCPAINT);
}
-
+ SelectObject (GlobalMemDC2, GlobalOldMemDC2Bitmap); //So we don't crunch on the next line...
DeleteObject (newbmp);
if (!sdb || !doubleBuffering || !ingame)
@@ -5178,7 +5178,7 @@
// Copy selected section of main bitmap into newbmp before rotation
SetStretchBltMode(GlobalMemDC2, COLORONCOLOR);
StretchBlt(GlobalMemDC2, 0, 0, destwidth, destheight, GlobalMemDC,
- srcx, srcy, srcwidth, srcheight, SRCPAINT);
+ srcx, srcy, srcwidth, srcheight, SRCCOPY);
//Fast (I hope) rectangle intersection, don't overwrite our borders
if (usebitmaphwnd)
@@ -5266,6 +5266,7 @@
BitBlt(hdc, x, y, newwidth, newheight, GlobalMemDC2, srcx, srcy, SRCAND);
}
+ SelectObject (GlobalMemDC2, GlobalOldMemDC2Bitmap); //So we don't crunch on the next line...
DeleteObject (newbmp);
if (!sdb || !doubleBuffering || !ingame)
Index: data.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/data.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- data.c 6 Jun 2006 05:14:14 -0000 1.32
+++ data.c 6 Jun 2006 08:23:06 -0000 1.33
@@ -771,6 +771,6 @@
WNDPROC lpfnDefRichEditWndProc; /* default window proc */
int richText = 0; /* temporary variable to select rich text message windows */
-int newQuit = 1;
+int newQuit = 0; /* new quit clock */
int newSound = 1; /* use new SDL sound */
int newSoundAngles = 1; /* use new SDL sound with angular 3d component */
\ No newline at end of file