fixed normalmap handling (my vectors were backwards), and corrected normalmap generat...

[xonotic/darkplaces.git] / vid_wgl.c

diff --git a/vid_wgl.c b/vid_wgl.c
index 194c0da8f5daeeead4e864c69c61bca1c97511cb..ffdc689db51a025614b6531481fb188e0fee28b1 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;
 
 
@@ -306,7 +307,8 @@ void VID_Finish (void)
        int vid_usemouse;
        if (r_render.integer && !scr_skipupdate)
        {
-               qglFinish();
+               if (r_speeds.integer || gl_finish.integer)
+                       qglFinish();
                hdc = GetDC(mainwindow);
                SwapBuffers(hdc);
                ReleaseDC(mainwindow, hdc);
@@ -506,6 +508,24 @@ void AppActivate(BOOL fActive, BOOL minimize)
        }
 }
 
+//TODO: move it around in vid_wgl.c since I dont think this is the right position
+void Sys_SendKeyEvents (void)
+{
+       MSG msg;
+
+       while (PeekMessage (&msg, NULL, 0, 0, PM_NOREMOVE))
+       {
+       // we always update if there are any event, even if we're paused
+               scr_skipupdate = 0;
+
+               if (!GetMessage (&msg, NULL, 0, 0))
+                       Sys_Quit ();
+
+               TranslateMessage (&msg);
+               DispatchMessage (&msg);
+       }
+}
+
 LONG CDAudio_MessageHandler(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
 
 /* main window procedure */
@@ -711,7 +731,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 +739,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 +840,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 +899,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 +943,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 +951,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 +966,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 +1178,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 +1189,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 +1207,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 +1216,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 +1226,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 +1237,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 +1263,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");
                }
        }
 
@@ -1335,7 +1352,7 @@ void IN_MouseMove (usercmd_t *cmd)
        {
                GetCursorPos (&current_pos);
                //ui_mouseupdate(current_pos.x - window_x, current_pos.y - window_y);
-               in_mouse_x = in_mouse_y = 0;
+               IN_Mouse( cmd, 0, 0 );
                return;
        }
 
@@ -1508,7 +1525,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 +1543,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 +1552,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 +1569,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 +1634,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