cleaned up rtlight handling, merging most code between world rtlights and dlights...

[xonotic/darkplaces.git] / vid_wgl.c

diff --git a/vid_wgl.c b/vid_wgl.c
index 3733ca1d3e8c30317db5293024530b716176bf48..30a08e84e0d4dda965490b3ec2af1e0aed558f73 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;
 
 
@@ -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;
@@ -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