Skip to content

Fix ACT1Q4_SetMonolithOrder skipping a monolith on a collision #236

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Lectem merged 1 commit into from
Sep 15, 2026
Merged

Fix ACT1Q4_SetMonolithOrder skipping a monolith on a collision #236

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion source/D2Game/src/QUESTS/ACT1/A1Q4.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,10 @@ void __fastcall ACT1Q4_SetMonolithOrder(D2QuestDataStrc* pQuestData)
pQuestDataEx->nCurrentMonolithNo = 0;

D2SeedStrc* pSeed = QUESTS_GetGlobalSeed(pQuestData->pGame);
for (int32_t i = 0; i < 5; ++i)
// The counter only advances once a stone has actually been placed, so the
// loop keeps rolling until all five monoliths have a class. Advancing it on
// every roll would leave the slots that lost a collision set to zero.
for (int32_t i = 0; i < 5;)
{
const uint32_t nRand = ITEMS_RollRandomNumber(pSeed) % 5;
if (!pQuestDataEx->nStoneOrder[nRand])
Expand All @@ -256,6 +259,7 @@ void __fastcall ACT1Q4_SetMonolithOrder(D2QuestDataStrc* pQuestData)
sprintf(szMessage, "stone %d is class %d", nRand, nMonolithClassIds[i]);
QUESTS_DebugOutput(pQuestData->pGame, szMessage, __FILE__, __LINE__);
pQuestDataEx->nStoneOrder[nRand] = nMonolithClassIds[i];
++i;
}
}
}
Expand Down
Loading