X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=vid_wgl.c;h=c714e0eb636134351f4fc7d4e58679a4bcdab432;hb=2b8e2f6c7403b90e6555218bf68288abb264da20;hp=b5acec4016639042de90d6629e01b236f07a3d50;hpb=fe01d340dc1e4674160027051cbb0d745ebfa1ec;p=xonotic%2Fdarkplaces.git

diff --git a/vid_wgl.c b/vid_wgl.c
index b5acec40..c714e0eb 100644
--- a/vid_wgl.c
+++ b/vid_wgl.c
@@ -254,7 +254,7 @@ void VID_Finish (void)
 	if (r_render.integer && !vid_hidden)
 	{
 		CHECKGLERROR
-		if (r_speeds.integer || gl_finish.integer)
+		if (r_speeds.integer == 2 || gl_finish.integer)
 		{
 			qglFinish();CHECKGLERROR
 		}
@@ -480,8 +480,8 @@ LONG WINAPI MainWndProc (HWND hWnd, UINT uMsg, WPARAM  wParam, LPARAM lParam)
 {
 	LONG    lRet = 1;
 	int		fActive, fMinimized, temp;
-	char	state[256];
-	char	asciichar[4];
+	unsigned char state[256];
+	unsigned char asciichar[4];
 	int		vkey;
 	int		charlength;
 	qboolean down = false;
@@ -579,9 +579,7 @@ LONG WINAPI MainWndProc (HWND hWnd, UINT uMsg, WPARAM  wParam, LPARAM lParam)
 				temp |= 512;
 
 #ifdef SUPPORTDIRECTX
-			if (vid_usingmouse && !dinput_acquired)
-#else
-			if (vid_usingmouse)
+			if (!dinput_acquired)
 #endif
 			{
 				// perform button actions
@@ -783,7 +781,7 @@ void VID_Init(void)
 	IN_Init();
 }
 
-int VID_InitMode (int fullscreen, int width, int height, int bpp, int refreshrate, int stereobuffer, int samples)
+int VID_InitMode (int fullscreen, int *width, int *height, int bpp, int refreshrate, int stereobuffer, int samples)
 {
 	int i;
 	HDC hdc;
@@ -812,7 +810,7 @@ int VID_InitMode (int fullscreen, int width, int height, int bpp, int refreshrat
 	};
 	int windowpass;
 	int pixelformat, newpixelformat;
-	int numpixelformats;
+	UINT numpixelformats;
 	DWORD WindowStyle, ExWindowStyle;
 	int CenterX, CenterY;
 	const char *gldrivername;
@@ -924,8 +922,8 @@ int VID_InitMode (int fullscreen, int width, int height, int bpp, int refreshrat
 			foundmode = true;
 			gdevmode.dmFields = DM_BITSPERPEL | DM_PELSWIDTH | DM_PELSHEIGHT;
 			gdevmode.dmBitsPerPel = bpp;
-			gdevmode.dmPelsWidth = width;
-			gdevmode.dmPelsHeight = height;
+			gdevmode.dmPelsWidth = *width;
+			gdevmode.dmPelsHeight = *height;
 			gdevmode.dmSize = sizeof (gdevmode);
 			if(refreshrate)
 			{
@@ -958,13 +956,13 @@ int VID_InitMode (int fullscreen, int width, int height, int bpp, int refreshrat
 						Con_Printf("wrong bpp\n");
 					continue;
 				}
-				if(thismode.dmPelsWidth != (DWORD)width)
+				if(thismode.dmPelsWidth != (DWORD)*width)
 				{
 					if(developer.integer >= 100)
 						Con_Printf("wrong width\n");
 					continue;
 				}
-				if(thismode.dmPelsHeight != (DWORD)height)
+				if(thismode.dmPelsHeight != (DWORD)*height)
 				{
 					if(developer.integer >= 100)
 						Con_Printf("wrong height\n");
@@ -1016,13 +1014,13 @@ int VID_InitMode (int fullscreen, int width, int height, int bpp, int refreshrat
 		if (!foundmode)
 		{
 			VID_Shutdown();
-			Con_Printf("Unable to find the requested mode %dx%dx%dbpp\n", width, height, bpp);
+			Con_Printf("Unable to find the requested mode %dx%dx%dbpp\n", *width, *height, bpp);
 			return false;
 		}
 		else if(ChangeDisplaySettings (&gdevmode, CDS_FULLSCREEN) != DISP_CHANGE_SUCCESSFUL)
 		{
 			VID_Shutdown();
-			Con_Printf("Unable to change to requested mode %dx%dx%dbpp\n", width, height, bpp);
+			Con_Printf("Unable to change to requested mode %dx%dx%dbpp\n", *width, *height, bpp);
 			return false;
 		}
 
@@ -1055,8 +1053,8 @@ int VID_InitMode (int fullscreen, int width, int height, int bpp, int refreshrat
 
 	rect.top = 0;
 	rect.left = 0;
-	rect.right = width;
-	rect.bottom = height;
+	rect.right = *width;
+	rect.bottom = *height;
 	AdjustWindowRectEx(&rect, WindowStyle, false, 0);
 
 	if (fullscreen)