OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- removed all remains of the old EAX editor.

Browse source
This commit is contained in:
Christoph Oelckers 2017-11-26 15:23:07 +01:00
commit 57058ef727
7 changed files with 485 additions and 877 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/win32/i_input.cpp
View file

@ -130,9 +130,6 @@ FJoystickCollection *JoyDevices[NUM_JOYDEVICES];
extern HINSTANCE g_hInst;
extern DWORD SessionID;
extern void ShowEAXEditor ();
extern bool SpawnEAXWindow;
static HMODULE DInputDLL;
bool GUICapture;
@ -141,10 +138,8 @@ extern FKeyboard *Keyboard;
bool VidResizing;
extern bool SpawnEAXWindow;
extern BOOL vidactive;
extern HWND Window, ConWindow;
extern HWND EAXEditWindow;
EXTERN_CVAR (String, language)
EXTERN_CVAR (Bool, lookstrafe)
@ -499,12 +494,6 @@ LRESULT CALLBACK WndProc (HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
break;
case WM_KEYDOWN:
// When the EAX editor is open, pressing Ctrl+Tab will switch to it
if (EAXEditWindow != 0 && wParam == VK_TAB && !(lParam & 0x40000000) &&
(GetKeyState (VK_CONTROL) & 0x8000))
{
SetForegroundWindow (EAXEditWindow);
}
break;
case WM_SYSKEYDOWN:
@ -530,11 +519,6 @@ LRESULT CALLBACK WndProc (HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
case WM_DISPLAYCHANGE:
case WM_STYLECHANGED:
if (SpawnEAXWindow)
{
SpawnEAXWindow = false;
ShowEAXEditor ();
}
return DefWindowProc(hWnd, message, wParam, lParam);
case WM_GETMINMAXINFO:
@ -797,14 +781,12 @@ void I_GetEvent ()
{
if (mess.message == WM_QUIT)
exit (mess.wParam);
if (EAXEditWindow == 0 || !IsDialogMessage (EAXEditWindow, &mess))
if (GUICapture)
{
if (GUICapture)
{
TranslateMessage (&mess);
}
DispatchMessage (&mess);
TranslateMessage (&mess);
}
DispatchMessage (&mess);
}
if (Keyboard != NULL)