stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-12-22 02:30:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix bugs discovered in testing.

Browse source
This commit is contained in:
toaster 2019-11-24 15:06:37 +00:00
parent f602e5bfb7
commit fd657d2ff4
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/m_menu.c
View file

@ -6625,6 +6625,8 @@ static void M_HandleChecklist(INT32 choice)
continue; continue;
if (unlockables[j].conditionset > MAXCONDITIONSETS) if (unlockables[j].conditionset > MAXCONDITIONSETS)
continue; continue;
if (!unlockables[j].unlocked && unlockables[j].showconditionset && !M_Achieved(unlockables[j].showconditionset))
continue;
if (unlockables[j].conditionset == unlockables[check_on].conditionset) if (unlockables[j].conditionset == unlockables[check_on].conditionset)
continue; continue;
break; break;
@ -6648,6 +6650,8 @@ static void M_HandleChecklist(INT32 choice)
continue; continue;
if (unlockables[j].conditionset > MAXCONDITIONSETS) if (unlockables[j].conditionset > MAXCONDITIONSETS)
continue; continue;
if (!unlockables[j].unlocked && unlockables[j].showconditionset && !M_Achieved(unlockables[j].showconditionset))
continue;
if (j && unlockables[j].conditionset == unlockables[j-1].conditionset) if (j && unlockables[j].conditionset == unlockables[j-1].conditionset)
continue; continue;
break; break;
@ -6687,7 +6691,10 @@ static void M_DrawChecklist(void)
if (unlockables[i].name[0] == 0 //|| unlockables[i].nochecklist if (unlockables[i].name[0] == 0 //|| unlockables[i].nochecklist
|| !unlockables[i].conditionset || unlockables[i].conditionset > MAXCONDITIONSETS || !unlockables[i].conditionset || unlockables[i].conditionset > MAXCONDITIONSETS
|| (!unlockables[i].unlocked && unlockables[i].showconditionset && !M_Achieved(unlockables[i].showconditionset))) || (!unlockables[i].unlocked && unlockables[i].showconditionset && !M_Achieved(unlockables[i].showconditionset)))
{
i++;
continue; continue;
}
V_DrawString(currentMenu->x, y, ((unlockables[i].unlocked) ? V_GREENMAP : V_TRANSLUCENT)|V_ALLOWLOWERCASE, ((unlockables[i].unlocked || !unlockables[i].nochecklist) ? unlockables[i].name : M_CreateSecretMenuOption(unlockables[i].name))); V_DrawString(currentMenu->x, y, ((unlockables[i].unlocked) ? V_GREENMAP : V_TRANSLUCENT)|V_ALLOWLOWERCASE, ((unlockables[i].unlocked || !unlockables[i].nochecklist) ? unlockables[i].name : M_CreateSecretMenuOption(unlockables[i].name)));
@ -6709,10 +6716,11 @@ static void M_DrawChecklist(void)
if (unlockables[i].objective[0] != '/') if (unlockables[i].objective[0] != '/')
{ {
addy(8); addy(16);
V_DrawString(currentMenu->x, y, V_DrawString(currentMenu->x, y-8,
V_ALLOWLOWERCASE, V_ALLOWLOWERCASE,
va("\x1E %s", unlockables[i].objective)); va("\x1E %s", unlockables[i].objective));
y -= 8;
} }
else else
{ {