ShuriZma
/
project64
mirror of https://github.com/project64/project64.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1622 from shygoo/nrage-improve-bginput 

[N-Rage] Make background input stable
This commit is contained in:
zilmar 2019-05-05 17:03:00 +09:30 committed by GitHub
parent f51dabcd7e c8ab33eb3c
commit 9c68405238
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Source/nragev20/NRagePluginV2.cpp
View File

@ -539,14 +539,7 @@ EXPORT void CALL GetKeys(int Control, BUTTONS * Keys )
#ifdef ENABLE_RAWPAK_DEBUG #ifdef ENABLE_RAWPAK_DEBUG
DebugWriteA("CALLED: GetKeys\n"); DebugWriteA("CALLED: GetKeys\n");
#endif #endif
if( g_bConfiguring || (!g_pcControllers[Control].bBackgroundInput && GetForegroundWindow() != g_strEmuInfo.hMainWindow) )
if( !g_pcControllers[Control].bBackgroundInput && GetForegroundWindow() != g_strEmuInfo.hMainWindow )
{
// cancel if main window isn't focused and background input is disabled
return;
}
if( g_bConfiguring )
Keys->Value = 0; Keys->Value = 0;
else else
{ {
@ -691,7 +684,8 @@ EXPORT void CALL ReadController( int Control, BYTE * Command )
// expected: controller gets 1 byte (command), controller sends back 4 bytes // expected: controller gets 1 byte (command), controller sends back 4 bytes
// should be: Command[0] == 0x01 // should be: Command[0] == 0x01
// Command[1] == 0x04 // Command[1] == 0x04
if( g_bConfiguring )
if( g_bConfiguring || (!g_pcControllers[Control].bBackgroundInput && GetForegroundWindow() != g_strEmuInfo.hMainWindow) )
Command[3] = Command[4] = Command[5] = Command[6] = 0; Command[3] = Command[4] = Command[5] = Command[6] = 0;
else else
{ {