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

zomby changes (sliders, etc)

This commit is contained in:
Aaron Robinson 2003-10-16 04:44:36 +00:00
parent 696434dc81
commit 8f9f07d99d
3 changed files with 45 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Doc/Changelog.txt
View File

@ -8,6 +8,9 @@ version: 0.7.9 (??/??/??)
- Added auto-pause functionality when window loses focus
- Fixes to slider device input, some more robust error handling
in input configuration (thanks Zomby!)
- Fixed start/back mapping problem :)
- Fixed a glitch in EmuExe that was outputting some bad Exes

4
Include/Cxbx.h
View File

@ -55,10 +55,10 @@ typedef signed short sint16;
typedef signed long sint32;
// define this to trace intercepted function calls
//#define _DEBUG_TRACE
#define _DEBUG_TRACE
// define this to trace warnings
//#define _DEBUG_WARNINGS
#define _DEBUG_WARNINGS
// version information
#ifndef _DEBUG_TRACE

47
Source/Win32/XBController.cpp
View File

@ -328,14 +328,32 @@ bool XBController::ConfigPoll(char *szStatus)
dwFlags |= (JoyState.lRz > 0) ? (DEVICE_FLAG_AXIS | DEVICE_FLAG_POSITIVE) : (DEVICE_FLAG_AXIS | DEVICE_FLAG_NEGATIVE);
}
else
{
for(int b=0;b<2;b++)
{
if(abs(JoyState.rglSlider[b]) > DETECT_SENSITIVITY_JOYSTICK)
{
dwHow = FIELD_OFFSET(XTL::DIJOYSTATE, rglSlider[b]);
else
dwFlags |= (JoyState.rglSlider[b] > 0) ? (DEVICE_FLAG_AXIS | DEVICE_FLAG_POSITIVE) : (DEVICE_FLAG_AXIS | DEVICE_FLAG_NEGATIVE);
}
}
}
/* temporarily disabled
if(dwHow == -1)
{
for(int b=0;b<4;b++)
{
if(abs(JoyState.rgdwPOV[b]) > DETECT_SENSITIVITY_POV)
{
dwHow = FIELD_OFFSET(XTL::DIJOYSTATE, rgdwPOV[b]);
else
}
}
}
//*/
if(dwHow == -1)
{
for(int b=0;b<32;b++)
{
if(JoyState.rgbButtons[b] > DETECT_SENSITIVITY_BUTTON)
@ -344,6 +362,7 @@ bool XBController::ConfigPoll(char *szStatus)
dwFlags |= DEVICE_FLAG_BUTTON;
}
}
}
// ******************************************************************
// * Retrieve Object Info
@ -950,6 +969,12 @@ void XBController::DInputInit(HWND hwnd)
}
}
// ******************************************************************
// * Enumerate Controller objects
// ******************************************************************
for(m_dwCurObject=0;m_dwCurObject<m_dwInputDeviceCount;m_dwCurObject++)
m_InputDevice[m_dwCurObject].m_Device->EnumObjects(WrapEnumObjectsCallback, this, DIDFT_ALL);
// ******************************************************************
// * Set cooperative level and acquire
// ******************************************************************
@ -973,12 +998,6 @@ void XBController::DInputInit(HWND hwnd)
}
}
}
// ******************************************************************
// * Enumerate Controller objects
// ******************************************************************
for(m_dwCurObject=0;m_dwCurObject<m_dwInputDeviceCount;m_dwCurObject++)
m_InputDevice[m_dwCurObject].m_Device->EnumObjects(WrapEnumObjectsCallback, this, DIDFT_ALL);
}
// ******************************************************************
@ -1014,7 +1033,7 @@ void XBController::Map(XBCtrlObject object, const char *szDeviceName, int dwInfo
m_ObjectConfig[object].dwInfo = dwInfo;
m_ObjectConfig[object].dwFlags = dwFlags;
// Purse unused device slots
// Purge unused device slots
for(int v=0;v<XBCTRL_MAX_DEVICES;v++)
{
bool inuse = false;
@ -1136,8 +1155,13 @@ BOOL XBController::EnumObjectsCallback(XTL::LPCDIDEVICEOBJECTINSTANCE lpddoi)
HRESULT hRet = m_InputDevice[m_dwCurObject].m_Device->SetProperty(DIPROP_RANGE, &diprg.diph);
if(FAILED(hRet))
{
if(hRet == E_NOTIMPL)
return DIENUM_CONTINUE;
else
return DIENUM_STOP;
}
}
else if(lpddoi->dwType & DIDFT_BUTTON)
{
XTL::DIPROPRANGE diprg;
@ -1152,8 +1176,13 @@ BOOL XBController::EnumObjectsCallback(XTL::LPCDIDEVICEOBJECTINSTANCE lpddoi)
HRESULT hRet = m_InputDevice[m_dwCurObject].m_Device->SetProperty(DIPROP_RANGE, &diprg.diph);
if(FAILED(hRet))
{
if(hRet == E_NOTIMPL)
return DIENUM_CONTINUE;
else
return DIENUM_STOP;
}
}
return DIENUM_CONTINUE;
}