thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-05-04 16:02:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Reduce code duplication in M_UpdateChallengeGridExtraData for adjacency rules

Browse source
This commit is contained in:
toaster 2024-04-30 22:19:12 +01:00
parent 200b817f9d
commit 04214c05ec
1 changed files with 18 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
src/m_cond.c
View file

@ -398,6 +398,20 @@ badgrid:
gamedata->challengegridwidth = 0; gamedata->challengegridwidth = 0;
} }
static void M_ChallengeGridExtraDataAdjacencyRules(challengegridextradata_t *extradata, UINT16 adjacent)
{
// Adjacent unlocked tile, permit hint/general key skip.
if (gamedata->unlocked[adjacent] == true)
{
extradata->flags |= CHE_HINT;
}
// Adjacent locked tile, prevent 10x key skip.
else
{
extradata->flags &= ~CHE_ALLCLEAR;
}
}
void M_UpdateChallengeGridExtraData(challengegridextradata_t *extradata) void M_UpdateChallengeGridExtraData(challengegridextradata_t *extradata)
{ {
UINT16 i, j, num, id, tempid, work; UINT16 i, j, num, id, tempid, work;
@ -489,14 +503,7 @@ void M_UpdateChallengeGridExtraData(challengegridextradata_t *extradata)
} }
else if (work < MAXUNLOCKABLES) else if (work < MAXUNLOCKABLES)
{ {
if (gamedata->unlocked[work] == true) M_ChallengeGridExtraDataAdjacencyRules(extradata+id, work);
{
extradata[id].flags |= CHE_HINT;
}
else
{
extradata[id].flags &= ~CHE_ALLCLEAR;
}
} }
} }
@ -534,14 +541,7 @@ void M_UpdateChallengeGridExtraData(challengegridextradata_t *extradata)
} }
else if (work < MAXUNLOCKABLES) else if (work < MAXUNLOCKABLES)
{ {
if (gamedata->unlocked[work] == true) M_ChallengeGridExtraDataAdjacencyRules(extradata+id, work);
{
extradata[id].flags |= CHE_HINT;
}
else
{
extradata[id].flags &= ~CHE_ALLCLEAR;
}
} }
} }
@ -566,14 +566,7 @@ void M_UpdateChallengeGridExtraData(challengegridextradata_t *extradata)
} }
else if (work < MAXUNLOCKABLES) else if (work < MAXUNLOCKABLES)
{ {
if (gamedata->unlocked[work] == true) M_ChallengeGridExtraDataAdjacencyRules(extradata+id, work);
{
extradata[id].flags |= CHE_HINT;
}
else
{
extradata[id].flags &= ~CHE_ALLCLEAR;
}
} }
} }
@ -595,14 +588,7 @@ void M_UpdateChallengeGridExtraData(challengegridextradata_t *extradata)
} }
else if (work < MAXUNLOCKABLES) else if (work < MAXUNLOCKABLES)
{ {
if (gamedata->unlocked[work] == true) M_ChallengeGridExtraDataAdjacencyRules(extradata+id, work);
{
extradata[id].flags |= CHE_HINT;
}
else
{
extradata[id].flags &= ~CHE_ALLCLEAR;
}
} }
} }
} }