From 60968b2f08c68df4ecf371618278e4b1b6adff79 Mon Sep 17 00:00:00 2001 From: toaster Date: Sun, 5 Mar 2023 20:59:56 +0000 Subject: [PATCH] UC_AND, UC_COMMA: Fix not combining with UCRP_REQUIRESPLAYING Fixes --- src/m_cond.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/m_cond.c b/src/m_cond.c index 6e0700cc0..5285d5835 100644 --- a/src/m_cond.c +++ b/src/m_cond.c @@ -797,7 +797,11 @@ static boolean M_CheckConditionSet(conditionset_t *c, player_t *player) return true; // Skip future conditions with the same ID if one fails, for obvious reasons - else if (lastID && lastID == cn->id && !achievedSoFar) + if (lastID && lastID == cn->id && !achievedSoFar) + continue; + + // Skip entries that are JUST for string building + if (cn->type == UC_AND || cn->type == UC_COMMA) continue; lastID = cn->id;