// gl_vidnt.c -- NT GL vid component
#include "quakedef.h"
-#include "winquake.h"
+#include <windows.h>
+#include <dsound.h>
#include "resource.h"
#include <commctrl.h>
+extern void S_BlockSound (void);
+extern void S_UnblockSound (void);
+extern HINSTANCE global_hInstance;
+
+
+#ifndef WM_MOUSEWHEEL
+#define WM_MOUSEWHEEL 0x020A
+#endif
+
// Tell startup code that we have a client
int cl_available = true;
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;
WNDCLASS wc;
InitCommonControls();
- hIcon = LoadIcon (global_hInstance, MAKEINTRESOURCE (IDI_ICON2));
+ hIcon = LoadIcon (global_hInstance, MAKEINTRESOURCE (IDI_ICON1));
// Register the frame class
wc.style = 0;
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;
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