thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'm30-profile' into 'master'

Browse source 
Add 8BitDo vanilla M30 control layout

See merge request kart-krew-dev/ring-racers-internal!2928
This commit is contained in:
AJ Martinez 2025-10-10 22:38:06 +00:00
commit 45a2470479
4 changed files with 30 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/command.c
View file

@ -113,6 +113,7 @@ CV_PossibleValue_t descriptiveinput_cons_t[] = {
{7, "6Bt. (D)"}, {7, "6Bt. (D)"},
{8, "6Bt. (E)"}, {8, "6Bt. (E)"},
{9, "6Bt. (F)"}, {9, "6Bt. (F)"},
{10, "6Bt. (G)"},
{0, NULL} {0, NULL}
}; };

19
src/k_menudraw.c
View file

@ -2325,7 +2325,7 @@ static void M_DrawCharSelectCursor(UINT8 num)
if (selectframesb[(setup_animcounter-1) % SELECTLEN] != NULL) if (selectframesb[(setup_animcounter-1) % SELECTLEN] != NULL)
V_DrawMappedPatch(x, y, V_TRANSLUCENT, W_CachePatchName(selectframesb[(setup_animcounter-1) % SELECTLEN], PU_CACHE), colormap); V_DrawMappedPatch(x, y, V_TRANSLUCENT, W_CachePatchName(selectframesb[(setup_animcounter-1) % SELECTLEN], PU_CACHE), colormap);
} }
} }
else else
{ {
@ -5670,22 +5670,25 @@ void M_DrawProfileControls(void)
help = va("6Bt. (Auto): Tries to guess your 6-button pad's layout."); help = va("6Bt. (Auto): Tries to guess your 6-button pad's layout.");
break; break;
case 4: case 4:
help = va("6Bt. (A): Saturn buttons, Retro-Bit Wired DInput layout."); help = va("6Bt. (A): Saturn (Retro-Bit Wired DInput) - C/Z = RB/RT");
break; break;
case 5: case 5:
help = va("6Bt. (B): Saturn buttons, Retro-Bit Wireless DInput layout."); help = va("6Bt. (B): Saturn (Retro-Bit Wireless DInput) - C/Z = LB/RB");
break; break;
case 6: case 6:
help = va("6Bt. (C): Saturn buttons, Retro-Bit XInput layout."); help = va("6Bt. (C): Saturn (Retro-Bit XInput) - C/Z = RT/LT");
break; break;
case 7: case 7:
help = va("6Bt. (D): Saturn buttons, arcade/8BitDo layout. (C/Z = RT/RB)"); help = va("6Bt. (D): Saturn (arcade / 8BitDo) - C/Z = RT/RB");
break; break;
case 8: case 8:
help = va("6Bt. (E): Saturn buttons, Hori/M30X layout. (LB/LT = LS/RS)"); help = va("6Bt. (E): Saturn (Hori/M30X) - C/Z = RT/RB, LB/LT = LS/RS");
break; break;
case 9: case 9:
help = va("6Bt. (F): Saturn buttons, Mayflash layout. (C/Z = RS/LS)"); help = va("6Bt. (F): Saturn (Mayflash) - C/Z = RS/LS");
break;
case 10:
help = va("6Bt. (G): Saturn (orig M30) - C/Z = RB/LB");
break; break;
} }
@ -6102,7 +6105,7 @@ static char *M_GetGameplayMode(void)
return va("Intense"); return va("Intense");
return va("Relaxed"); return va("Relaxed");
} }
if (franticitems) if (franticitems)
{ {
if (cv_4thgear.value) if (cv_4thgear.value)

3
src/v_draw.cpp
View file

@ -266,6 +266,9 @@ Draw::TextElement& Draw::TextElement::parse(std::string_view raw)
case 9: case 9:
padconfig = saturntypeF; padconfig = saturntypeF;
break; break;
case 10:
padconfig = saturntypeG;
break;
} }
if (auto pretty = prettyinputs.find(bind); pretty != prettyinputs.end()) // Gamepad direction or keyboard arrow, use something nice-looking if (auto pretty = prettyinputs.find(bind); pretty != prettyinputs.end()) // Gamepad direction or keyboard arrow, use something nice-looking

15
src/v_draw.hpp
View file

@ -201,6 +201,21 @@ static const srb2::HashMap<INT32, char> saturntypeF = {
{nc_back, gb_back}, {nc_back, gb_back},
}; };
// Saturn Type G - 8BitDo M30 (non-Xbox)
// Cannot be disambiguated.
static const srb2::HashMap<INT32, char> saturntypeG = {
{nc_a, sb_a},
{nc_b, sb_b},
{nc_x, sb_x},
{nc_y, sb_y},
{nc_rt, gb_rt},
{nc_lt, gb_lt},
{nc_lb, sb_z},
{nc_rb, sb_c},
{nc_start, gb_start},
{nc_back, gb_back},
};
namespace srb2 namespace srb2
{ {