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

Merge branch 'fury-bike-2' into 'master'

Browse source 
Also prevent Fury Bike chao key blastin (resolves #1275)

Closes #1275

See merge request KartKrew/Kart!2289
This commit is contained in:
toaster 2024-04-14 23:11:30 +00:00
commit 38c405f3a1
4 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/m_cond.c
View file

@ -1300,7 +1300,7 @@ void M_SetNetUnlocked(void)
{
for (i = 0; i < MAXUNLOCKABLES; i++)
{
if (unlockables[i].conditionset == 55)
if (unlockables[i].conditionset == CH_FURYBIKE)
continue;
netUnlocked[i] = true;
@ -3094,7 +3094,7 @@ char *M_BuildConditionSetString(UINT16 unlockid)
}
}
if (usedTourney && unlockables[unlockid].conditionset == 55 && gamedata->unlocked[unlockid] == false)
if (usedTourney && unlockables[unlockid].conditionset == CH_FURYBIKE && gamedata->unlocked[unlockid] == false)
{
strcpy(message, "Power shrouds this challenge in darkness... (Return here without Tournament Mode!)\0");
}

2
src/m_cond.h
View file

@ -281,6 +281,8 @@ typedef enum
#endif
#define challengegridloops (gamedata->challengegridwidth >= CHALLENGEGRIDLOOPWIDTH)
#define CH_FURYBIKE 55
// See also M_PlayMenuJam
typedef enum {
GDMUSIC_NONE = 0,

2
src/m_pw.cpp
View file

@ -109,7 +109,7 @@ void f_tournament()
{
if (!unlockables[i].conditionset)
continue;
if (unlockables[i].conditionset == 55)
if (unlockables[i].conditionset == CH_FURYBIKE)
continue;
if (gamedata->unlocked[i])
continue;

4
src/menus/extras-challenges.c
View file

@ -468,6 +468,10 @@ boolean M_CanKeyHiliTile(void)
return false;
}
// Fury Bike
if (unlockables[challengesmenu.currentunlock].conditionset == CH_FURYBIKE)
return false;
// All good!
return true;
}