thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-02-18 03:22:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Assign p1 device during goner/title + unassign all

Browse source 
Avoids the controller reassignment message and ensures only one
controller participates in goner setup. Also unassign all devices when
returning to the title screen
This commit is contained in:
Eidolon 2024-01-02 14:38:34 -06:00
parent 4277c6d930
commit 30cd354014
2 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/g_game.c
View file

@ -313,7 +313,7 @@ boolean thwompsactive; // Thwomps activate on lap 2
UINT8 lastLowestLap; // Last lowest lap, for activating race lap executors
SINT8 spbplace; // SPB exists, give the person behind better items
boolean rainbowstartavailable; // Boolean, keeps track of if the rainbow start was gotten
tic_t linecrossed; // For Time Attack
tic_t linecrossed; // For Time Attack
boolean inDuel; // Boolean, keeps track of if it is a 1v1
// Client-sided, unsynched variables (NEVER use in anything that needs to be synced with other players)
@ -1319,6 +1319,10 @@ boolean G_Responder(event_t *ev)
|| abs(ev->data3) > JOYAXISRANGE/2))
))
{
if (ev->device > 0)
{
G_SetDeviceForPlayer(0, ev->device);
}
M_StartControlPanel();
return true;
}

13
src/k_menufunc.c
View file

@ -372,8 +372,8 @@ void M_PlayMenuJam(void)
const boolean trulystarted = M_GameTrulyStarted();
const boolean profilemode = (
trulystarted
&& optionsmenu.profilemenu
trulystarted
&& optionsmenu.profilemenu
&& !optionsmenu.resetprofilemenu
);
@ -423,7 +423,7 @@ void M_PlayMenuJam(void)
"KEYGEN",
"LOSERC",
};
if (refMenu != NULL && NotCurrentlyPlaying(overridetotrack[override - 1]))
{
Music_Remap("menu", overridetotrack[override - 1]);
@ -682,7 +682,14 @@ void M_ClearMenus(boolean callexitmenufunc)
#endif //Alam: But not on the Dreamcast's VMUs
if (gamestate == GS_MENU) // Back to title screen
{
int i;
for (i = 0; i < MAXSPLITSCREENPLAYERS; i++)
{
G_SetDeviceForPlayer(i, -1);
}
D_StartTitle();
}
menutyping.active = false;
menumessage.active = false;