Fixes to the new condition types

This commit is contained in:
Andre Leiradella 2017-08-17 21:14:50 +01:00
parent b2fd9c5b05
commit 8cae8a5720

View File

@ -1925,7 +1925,7 @@ static int cheevos_test_cond_set(const cheevos_condset_t *condset,
/* Read all standard conditions, and process as normal: */
for (cond = condset->conds; cond < end; cond++)
{
if (cond->type != CHEEVOS_COND_TYPE_STANDARD)
if (cond->type == CHEEVOS_COND_TYPE_PAUSE_IF || cond->type == CHEEVOS_COND_TYPE_RESET_IF)
continue;
if (cond->type == CHEEVOS_COND_TYPE_ADD_SOURCE)
@ -1954,7 +1954,7 @@ static int cheevos_test_cond_set(const cheevos_condset_t *condset,
continue;
}
if (cond->req_hits != 0 && cond->curr_hits >= cond->req_hits)
if (cond->req_hits != 0 && (cond->curr_hits + cheevos_locals.add_hits) >= cond->req_hits)
continue;
cond_valid = cheevos_test_condition(cond);