Apple-2-Tools/AppleWin
1
0
Fork 0
mirror of https://github.com/AppleWin/AppleWin.git synced 2024-06-08 01:29:42 +00:00
Code Issues Projects Releases Wiki Activity

Tidy

Browse Source
This commit is contained in:
tomcw 2022-12-15 08:45:02 +00:00
parent 7efdee7554
commit 8308d3930d
2 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
source/SNESMAX.cpp
View File

@ -43,13 +43,10 @@
Bit 6 = Controller 2, Active Low
Bit 7 = Controller 1, Active Low
Once data is read, button presses (for each controller) should be stored in the following structure
Once data is read, button presses (for each controller) are stored in the following structure:
bit# 7 6 5 4 3 2 1 0
Byte 0: R:L:D:U:St:Sl:Y:B
Byte 1: x:x:x:x:Fr:Fl:X:A
The variable controllerXButtons will be stored in the reverse order.
bit# 11 10 9 8 / 7 6 5 4 3 2 1 0
m_controllerXButtons: x:x:x:x:Fr:Fl:X:A / R:L:D:U:St:Sl:Y:B
Alex Lukacz Aug 2021
*/
@ -156,7 +153,7 @@ void SNESMAXCard::GetControllerButtons(UINT joyNum, JOYINFOEX& infoEx, UINT& con
if (!altControllerType)
{
// Logitech F310, Dualshock 4
// Logitech F310, Sony DualShock 4
// b11,..,b0: -,-,St,Sl / -,-,R,L,X,A,B,Y
controllerButtons |= ((infoEx.dwButtons & 0x0002) >> 1); // B Button
controllerButtons |= ((infoEx.dwButtons & 0x0001) << 1); // Y Button

8
source/SNESMAX.h
View File

@ -33,13 +33,13 @@ public:
virtual void SaveSnapshot(YamlSaveHelper& yamlSaveHelper);
virtual bool LoadSnapshot(YamlLoadHelper& yamlLoadHelper, UINT version);
void GetControllerButtons(UINT joyNum, JOYINFOEX& infoEx, UINT& controllerButtons, bool altControllerType);
static bool ParseControllerMappingFile(UINT joyNum, const char* pathname, std::string& errorMsg);
enum Button {B, Y, SELECT, START, U, D, L, R, A, X, LB, RB, UNUSED1, UNUSED2, UNUSED3, UNUSED4, NUM_BUTTONS, UNUSED};
private:
void GetControllerButtons(UINT joyNum, JOYINFOEX& infoEx, UINT& controllerButtons, bool altControllerType);
enum Button { B, Y, SELECT, START, U, D, L, R, A, X, LB, RB, UNUSED1, UNUSED2, UNUSED3, UNUSED4, NUM_BUTTONS, UNUSED };
UINT m_buttonIndex;
UINT m_controller1Buttons;
UINT m_controller2Buttons;