- Consolidated all conversation reply handling into a single function executed on all

machines, so when an NPC need to show the "enough" response, it has enough
  information available to do so.
- Some new Strife Teaser fixes I forgot to commit are in here.
- Moved norawinput check into FindRawInputFunctions().


SVN r2120 (trunk)
This commit is contained in:
Randy Heit 2010-01-22 05:17:57 +00:00
commit 71b75f0d7a
9 changed files with 486 additions and 485 deletions

View file

@ -598,7 +598,7 @@ bool I_InitInput (void *hwnd)
g_pdi = NULL;
g_pdi3 = NULL;
if (!norawinput) FindRawInputFunctions();
FindRawInputFunctions();
// Try for DirectInput 8 first, then DirectInput 3 for NT 4's benefit.
DInputDLL = LoadLibrary("dinput8.dll");
@ -938,13 +938,16 @@ bool FInputDevice::WndProcHook(HWND hWnd, UINT message, WPARAM wParam, LPARAM lP
static void FindRawInputFunctions()
{
HMODULE user32 = GetModuleHandle("user32.dll");
if (user32 == NULL)
if (!norawinput)
{
return; // WTF kind of broken system are we running on?
}
HMODULE user32 = GetModuleHandle("user32.dll");
if (user32 == NULL)
{
return; // WTF kind of broken system are we running on?
}
#define RIF(name,ret,args) \
My##name = (name##Proto)GetProcAddress(user32, #name);
My##name = (name##Proto)GetProcAddress(user32, #name);
#include "rawinput.h"
}
}