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

Fix Challenge Grid population where multiple large tiles should be packed closely together

Browse source
This commit is contained in:
toaster 2022-12-02 21:18:47 +00:00
parent ac15d4caa3
commit 3c915d8f68
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/m_cond.c
View file

@ -98,7 +98,7 @@ void M_PopulateChallengeGrid(void)
{
// Getting the number of 2-highs you can fit into two adjacent columns.
UINT8 majorpad = (CHALLENGEGRIDHEIGHT/2);
majorpad = (nummajorunlocks/majorpad)+1;
majorpad = (nummajorunlocks+1)/majorpad;
if (gamedata->challengegridwidth < majorpad*2)
gamedata->challengegridwidth = majorpad*2;
}
@ -122,7 +122,7 @@ void M_PopulateChallengeGrid(void)
// You lose one from CHALLENGEGRIDHEIGHT because it is impossible to place a 2-high tile on the bottom row.
UINT16 numspots = gamedata->challengegridwidth * (CHALLENGEGRIDHEIGHT-1);
// 0 is row, 1 is column
UINT8 quickcheck[numspots][2];
INT16 quickcheck[numspots][2];
// Prepare the easy-grab spots.
for (i = 0; i < numspots; i++)
@ -134,7 +134,7 @@ void M_PopulateChallengeGrid(void)
// Place in random valid locations.
while (nummajorunlocks > 0 && numspots > 0)
{
UINT8 row, col;
INT16 row, col;
j = M_RandomKey(numspots);
row = quickcheck[j][0];
col = quickcheck[j][1];
@ -164,10 +164,10 @@ void M_PopulateChallengeGrid(void)
for (i = 0; i < numspots; i++)
{
quickcheckagain:
if (abs(((signed)quickcheck[i][0]) - ((signed)row)) <= 1 // Row distance
|| abs(((signed)quickcheck[i][1]) - ((signed)col)) <= 1 // Column distance
if (abs((quickcheck[i][0]) - (row)) <= 1 // Row distance
&& (abs((quickcheck[i][1]) - (col)) <= 1 // Column distance
|| (quickcheck[i][1] == 0 && col == gamedata->challengegridwidth-1) // Wraparounds l->r
|| (quickcheck[i][1] == gamedata->challengegridwidth-1 && col == 0)) // Wraparounds r->l
|| (quickcheck[i][1] == gamedata->challengegridwidth-1 && col == 0))) // Wraparounds r->l
{
numspots--; // Remove from possible indicies
if (i == numspots)
@ -184,7 +184,7 @@ quickcheckagain:
if (nummajorunlocks > 0)
{
I_Error("M_PopulateChallengeGrid: was not able to populate %d large tiles", nummajorunlocks);
I_Error("M_PopulateChallengeGrid: was not able to populate %d large tiles (width %d)", nummajorunlocks, gamedata->challengegridwidth);
}
}