*** empty log message ***

[xonotic/darkplaces.git] / vid_wgl.c

diff --git a/vid_wgl.c b/vid_wgl.c
index fa20f90f99366b9dde4ed0bedf76fe04f309dbc2..da0bee76199c84e68d868a2a7837158bd7151e2e 100644 (file)
--- a/vid_wgl.c
+++ b/vid_wgl.c
@@ -26,6 +26,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <commctrl.h>
 
 extern void S_BlockSound (void);
+extern void S_UnblockSound (void);
 extern HINSTANCE global_hInstance;
 
 
@@ -548,7 +549,7 @@ LONG WINAPI MainWndProc (HWND hWnd, UINT uMsg, WPARAM  wParam, LPARAM lParam)
                        GetKeyboardState (state);
                        // alt/ctrl/shift tend to produce funky ToAscii values,
                        // and if it's not a single character we don't know care about it
-                       if (vkey == K_ALT || vkey == K_CTRL || vkey == K_SHIFT || ToAscii (wParam, lParam >> 16, state, asciichar, 0) != 1)
+                       if (vkey == K_ALT || vkey == K_CTRL || vkey == K_SHIFT || ToAscii (wParam, lParam >> 16, state, (unsigned short *)asciichar, 0) != 1)
                                asciichar[0] = 0;
                        Key_Event (vkey, asciichar[0], down);
                        break;
@@ -711,7 +712,7 @@ void VID_Init(void)
        WNDCLASS wc;
 
        InitCommonControls();
-       hIcon = LoadIcon (global_hInstance, MAKEINTRESOURCE (IDI_ICON2));
+       hIcon = LoadIcon (global_hInstance, MAKEINTRESOURCE (IDI_ICON1));
 
        // Register the frame class
        wc.style         = 0;
@@ -719,7 +720,7 @@ void VID_Init(void)
        wc.cbClsExtra    = 0;
        wc.cbWndExtra    = 0;
        wc.hInstance     = global_hInstance;
-       wc.hIcon         = 0;
+       wc.hIcon         = hIcon;
        wc.hCursor       = LoadCursor (NULL,IDC_ARROW);
        wc.hbrBackground = NULL;
        wc.lpszMenuName  = 0;
@@ -820,13 +821,13 @@ int VID_InitMode (int fullscreen, int width, int height, int bpp)
                if (i & RC_PALETTE)
                {
                        VID_Shutdown();
-                       Con_Printf ("Can't run in non-RGB mode\n");
+                       Con_Print("Can't run in non-RGB mode\n");
                        return false;
                }
                if (bpp > depth)
                {
                        VID_Shutdown();
-                       Con_Printf ("A higher desktop depth is required to run this video mode\n");
+                       Con_Print("A higher desktop depth is required to run this video mode\n");
                        return false;
                }
 
@@ -879,10 +880,7 @@ int VID_InitMode (int fullscreen, int width, int height, int bpp)
        ShowWindow (mainwindow, SW_SHOWDEFAULT);
        UpdateWindow (mainwindow);
 
-       SendMessage (mainwindow, WM_SETICON, (WPARAM)true, (LPARAM)hIcon);
-       SendMessage (mainwindow, WM_SETICON, (WPARAM)false, (LPARAM)hIcon);
-
-       VID_UpdateWindowStatus ();
+       VID_UpdateWindowStatus ();
 
        // now we try to make sure we get the focus on the mode switch, because
        // sometimes in some systems we don't.  We grab the foreground, then
@@ -926,7 +924,7 @@ int VID_InitMode (int fullscreen, int width, int height, int bpp)
        if (!GL_CheckExtension("wgl", wglfuncs, NULL, false))
        {
                VID_Shutdown();
-               Con_Printf("wgl functions not found\n");
+               Con_Print("wgl functions not found\n");
                return false;
        }
 
@@ -934,7 +932,7 @@ int VID_InitMode (int fullscreen, int width, int height, int bpp)
        if (!baseRC)
        {
                VID_Shutdown();
-               Con_Printf("Could not initialize GL (wglCreateContext failed).\n\nMake sure you are in 65536 color mode, and try running -window.\n");
+               Con_Print("Could not initialize GL (wglCreateContext failed).\n\nMake sure you are in 65536 color mode, and try running -window.\n");
                return false;
        }
        if (!qwglMakeCurrent(hdc, baseRC))
@@ -949,7 +947,7 @@ int VID_InitMode (int fullscreen, int width, int height, int bpp)
        if (qglGetString == NULL)
        {
                VID_Shutdown();
-               Con_Printf("glGetString not found\n");
+               Con_Print("glGetString not found\n");
                return false;
        }
        gl_renderer = qglGetString(GL_RENDERER);
@@ -1161,7 +1159,7 @@ qboolean IN_InitDInput (void)
 
                if (hInstDI == NULL)
                {
-                       Con_SafePrintf ("Couldn't load dinput.dll\n");
+                       Con_SafePrint("Couldn't load dinput.dll\n");
                        return false;
                }
        }
@@ -1172,7 +1170,7 @@ qboolean IN_InitDInput (void)
 
                if (!pDirectInputCreate)
                {
-                       Con_SafePrintf ("Couldn't get DI proc addr\n");
+                       Con_SafePrint("Couldn't get DI proc addr\n");
                        return false;
                }
        }
@@ -1190,7 +1188,7 @@ qboolean IN_InitDInput (void)
 
        if (FAILED(hr))
        {
-               Con_SafePrintf ("Couldn't open DI mouse device\n");
+               Con_SafePrint("Couldn't open DI mouse device\n");
                return false;
        }
 
@@ -1199,7 +1197,7 @@ qboolean IN_InitDInput (void)
 
        if (FAILED(hr))
        {
-               Con_SafePrintf ("Couldn't set DI mouse format\n");
+               Con_SafePrint("Couldn't set DI mouse format\n");
                return false;
        }
 
@@ -1209,7 +1207,7 @@ qboolean IN_InitDInput (void)
 
        if (FAILED(hr))
        {
-               Con_SafePrintf ("Couldn't set DI coop level\n");
+               Con_SafePrint("Couldn't set DI coop level\n");
                return false;
        }
 
@@ -1220,7 +1218,7 @@ qboolean IN_InitDInput (void)
 
        if (FAILED(hr))
        {
-               Con_SafePrintf ("Couldn't set DI buffersize\n");
+               Con_SafePrint("Couldn't set DI buffersize\n");
                return false;
        }
 
@@ -1246,11 +1244,11 @@ void IN_StartupMouse (void)
 
                if (dinput)
                {
-                       Con_SafePrintf ("DirectInput initialized\n");
+                       Con_SafePrint("DirectInput initialized\n");
                }
                else
                {
-                       Con_SafePrintf ("DirectInput not initialized\n");
+                       Con_SafePrint("DirectInput not initialized\n");
                }
        }
 
@@ -1508,7 +1506,7 @@ void IN_StartupJoystick (void)
        // verify joystick driver is present
        if ((numdevs = joyGetNumDevs ()) == 0)
        {
-               Con_Printf ("\njoystick not found -- driver not present\n\n");
+               Con_Print("\njoystick not found -- driver not present\n\n");
                return;
        }
 
@@ -1526,7 +1524,7 @@ void IN_StartupJoystick (void)
        // abort startup if we didn't find a valid joystick
        if (mmr != JOYERR_NOERROR)
        {
-               Con_Printf ("\njoystick not found -- no valid joysticks (%x)\n\n", mmr);
+               Con_Printf("\njoystick not found -- no valid joysticks (%x)\n\n", mmr);
                return;
        }
 
@@ -1535,7 +1533,7 @@ void IN_StartupJoystick (void)
        memset (&jc, 0, sizeof(jc));
        if ((mmr = joyGetDevCaps (joy_id, &jc, sizeof(jc))) != JOYERR_NOERROR)
        {
-               Con_Printf ("\njoystick not found -- invalid joystick capabilities (%x)\n\n", mmr);
+               Con_Printf("\njoystick not found -- invalid joystick capabilities (%x)\n\n", mmr);
                return;
        }
 
@@ -1552,7 +1550,7 @@ void IN_StartupJoystick (void)
        joy_avail = true;
        joy_advancedinit = false;
 
-       Con_Printf ("\njoystick detected\n\n");
+       Con_Print("\njoystick detected\n\n");
 }
 
 
@@ -1617,7 +1615,7 @@ void Joy_AdvancedUpdate_f (void)
                if (strcmp (joy_name.string, "joystick") != 0)
                {
                        // notify user of advanced controller
-                       Con_Printf ("\n%s configured\n\n", joy_name.string);
+                       Con_Printf("\n%s configured\n\n", joy_name.string);
                }
 
                // advanced initialization here