mirror-games/dca3-game
1
0
Fork 0
mirror of https://gitlab.com/skmp/dca3-game.git synced 2025-09-25 05:41:42 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'pgta/ControllerMappingPt2' into 'main'

Browse Source 
Pgta/controller mapping pt2

See merge request skmp/dca3-game!71
This commit is contained in:
Stefanos Kornilios Mitsis Poiitidis
2025-03-25 17:07:27 +00:00
parent c1f9cea93c 2fb88c56ef
commit ad0e0ac6fb
1 changed files with 22 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/miami/core/Pad.cpp
View File

@@ -2026,6 +2026,10 @@ void CPad::Update(int16 pad)
NewState.RightStickY = 0; NewState.RightStickY = 0;
NewState.RightShock = 0; NewState.RightShock = 0;
NewState.LeftShoulder1 = 0; NewState.LeftShoulder1 = 0;
NewState.Cross = 0; // Added for safety
NewState.Triangle = 0; // Added for safety
NewState.Circle = 0; // Added for safety
NewState.Square = 0; // Added for safety
} }
else else
{ {
@@ -2048,8 +2052,13 @@ void CPad::Update(int16 pad)
NewState.RightStickX = state->joy2x; NewState.RightStickX = state->joy2x;
NewState.RightStickY = state->joy2y; NewState.RightStickY = state->joy2y;
NewState.RightShock = state->dpad_left; NewState.RightShock = state->dpad_left;
NewState.LeftShoulder1 = (state->rtrig > 128 && state->ltrig > 128) ? 255 : 0; NewState.LeftShoulder1 = (state->rtrig > 128 && state->ltrig > 128) ? 255 : 0;
// Add PS2-style A and B mappings, This may be the only solution for purchase items issue ?...
//Further more we can add other PS2 specific mapping here as certain `bool CPad::` functions are not available for mapping down below.
NewState.Cross = NewState.A; // A -> Cross (accept/purchase)
NewState.Triangle = NewState.B; // B -> Triangle (exit)
NewState.Circle = NewState.X; // Optional: X -> Circle
NewState.Square = NewState.Y; // Optional: Y -> Square
} }
} }
@@ -2076,6 +2085,10 @@ void CPad::Update(int16 pad)
NewState.RightStickY = 0; NewState.RightStickY = 0;
NewState.RightShock = 0; NewState.RightShock = 0;
NewState.LeftShoulder1 = 0; NewState.LeftShoulder1 = 0;
NewState.Cross = 0; // Added for safety
NewState.Triangle = 0; // Added for safety
NewState.Circle = 0; // Added for safety
NewState.Square = 0; // Added for safety
} }
// if (old_contMaple == nullptr && contMaple != nullptr) // if (old_contMaple == nullptr && contMaple != nullptr)
@@ -2132,12 +2145,12 @@ void CPad::Update(int16 pad)
if ( JustOutOfFrontend != 0 ) if ( JustOutOfFrontend != 0 )
--JustOutOfFrontend; --JustOutOfFrontend;
#ifdef RW_DC
//auto old_contMaple = contMaple; //auto old_contMaple = contMaple;
//auto n_dev = maple_enum_count(); //auto n_dev = maple_enum_count();
contMaple = maple_enum_type(0, MAPLE_FUNC_CONTROLLER); contMaple = maple_enum_type(0, MAPLE_FUNC_CONTROLLER);
state = (cont_state_t *)maple_dev_status(contMaple); state = (cont_state_t *)maple_dev_status(contMaple);
#endif
} }
void CPad::DoCheats(void) void CPad::DoCheats(void)
@@ -3515,16 +3528,15 @@ bool CPad::CycleCameraModeJustDown(void)
bool result; bool result;
switch (CURMODE) switch (CURMODE)
{ {
case 0: case 0: //audible feedback when changing camera ?
case 2:
case 3:
{ {
result = !!(NewState.Select && !OldState.Select); result = !!(NewState.DPadUp && !OldState.DPadUp);
break; break;
} }
case 1: case 1: //audible feedback when changing camera ?
{ {
result = !!(NewState.DPadUp && !OldState.DPadUp); result = !!(NewState.DPadUp && !OldState.DPadUp);
@@ -3541,9 +3553,9 @@ bool CPad::CycleCameraModeJustDown(void)
{ {
switch (CURMODE) switch (CURMODE)
{ {
case 1: case 1: //audible feedback when changing camera ?
{ {
result = !!(NewState.DPadDown && !OldState.DPadDown); result = !!(NewState.DPadUp && !OldState.DPadUp);
break; break;
} }
default: default: