thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-04-27 12:31:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'mayflash-profile' into 'master'

Browse source 
Mayflash profile

See merge request kart-krew-dev/ring-racers-internal!2864
This commit is contained in:
Eidolon 2025-09-16 21:28:42 -05:00
commit 317ebcbb88
4 changed files with 25 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/command.c
View file

@ -103,7 +103,7 @@ CV_PossibleValue_t gpdifficulty_cons_t[] = {
{0, NULL} {0, NULL}
}; };
CV_PossibleValue_t descriptiveinput_cons_t[] = { CV_PossibleValue_t descriptiveinput_cons_t[] = {
{0, "\"Emulator\""}, {0, "\"Emulator\""},
{1, "Modern"}, {1, "Modern"},
{2, "Modern Flip"}, {2, "Modern Flip"},
{3, "6Bt. (Auto)"}, {3, "6Bt. (Auto)"},
@ -112,6 +112,7 @@ CV_PossibleValue_t descriptiveinput_cons_t[] = {
{6, "6Bt. (C)"}, {6, "6Bt. (C)"},
{7, "6Bt. (D)"}, {7, "6Bt. (D)"},
{8, "6Bt. (E)"}, {8, "6Bt. (E)"},
{9, "6Bt. (F)"},
{0, NULL} {0, NULL}
}; };

3
src/k_menudraw.c
View file

@ -5673,6 +5673,9 @@ void M_DrawProfileControls(void)
case 8: case 8:
help = va("6Bt. (E): Saturn buttons, Hori/M30X layout. (LB/LT = LS/RS)"); help = va("6Bt. (E): Saturn buttons, Hori/M30X layout. (LB/LT = LS/RS)");
break; break;
case 9:
help = va("6Bt. (F): Saturn buttons, Mayflash layout. (C/Z = RS/LS)");
break;
} }
V_DrawThinString(12, ypos, V_YELLOWMAP, help); V_DrawThinString(12, ypos, V_YELLOWMAP, help);

3
src/v_draw.cpp
View file

@ -263,6 +263,9 @@ Draw::TextElement& Draw::TextElement::parse(std::string_view raw)
case 8: case 8:
padconfig = saturntypeE; padconfig = saturntypeE;
break; break;
case 9:
padconfig = saturntypeF;
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

17
src/v_draw.hpp
View file

@ -184,6 +184,23 @@ static const srb2::HashMap<INT32, char> saturntypeE = {
{nc_back, gb_back}, {nc_back, gb_back},
}; };
// Saturn Type F - Mayflash XInput Saturn adapter, CZ = RS LS
// Cannot be disambiguated. GEE I SURE WISH THERE WERE A STANDARD
static const srb2::HashMap<INT32, char> saturntypeF = {
{nc_a, sb_a},
{nc_b, sb_b},
{nc_x, sb_x},
{nc_y, sb_y},
{nc_rt, gb_rt},
{nc_rb, gb_rb},
{nc_lb, gb_lb},
{nc_lt, gb_lt},
{nc_ls, sb_z},
{nc_rs, sb_c},
{nc_start, gb_start},
{nc_back, gb_back},
};
namespace srb2 namespace srb2
{ {