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 'goner-assignment' into 'master'

Browse source 
Assign p1 device during goner/title + unassign all

See merge request KartKrew/Kart!1768
This commit is contained in:
toaster 2024-01-05 12:35:20 +00:00
commit b5c1e89645
2 changed files with 12 additions and 1 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;
}

7
src/k_menufunc.c
View file

@ -746,7 +746,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;