Merge branch 'radiomode3' into 'master'

Fix conditionset-based unlocks on the Sound Test (resolves #312).

Closes #312

See merge request STJr/SRB2Internal!508
This commit is contained in:
MascaraSnake 2019-11-22 14:12:03 -05:00
commit 44fa076698

View file

@ -1685,7 +1685,7 @@ boolean S_PrepareSoundTest(void)
soundtestdefs[pos++] = def; soundtestdefs[pos++] = def;
if (def->soundtestcond > 0 && !(mapvisited[def->soundtestcond-1] & MV_BEATEN)) if (def->soundtestcond > 0 && !(mapvisited[def->soundtestcond-1] & MV_BEATEN))
continue; continue;
if (def->soundtestcond < 0 && !M_Achieved(1-def->soundtestcond)) if (def->soundtestcond < 0 && !M_Achieved(-1-def->soundtestcond))
continue; continue;
def->allowed = true; def->allowed = true;
} }