From 83202461c77aa64d1fe691ea6b07253e07e3b089 Mon Sep 17 00:00:00 2001 From: Sveinung Kvilhaugsvik Date: Fri, 11 Jun 2021 11:07:35 +0200 Subject: [PATCH 12/14] are_requirements_contradictions(): DiplRel like. Prepare are_requirements_contradictions()'s DiplRel handling to be used by diplomatic status requirement types other than DiplRel. See osdn #42514 --- common/requirements.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/requirements.c b/common/requirements.c index eca1ffd4ca..5d58d04afa 100644 --- a/common/requirements.c +++ b/common/requirements.c @@ -1193,7 +1193,7 @@ bool are_requirements_contradictions(const struct requirement *req1, return FALSE; break; case VUT_DIPLREL: - if (req2->source.kind != VUT_DIPLREL) { + if (req2->source.kind != req1->source.kind) { /* Finding contradictions across requirement kinds aren't supported * for DiplRel requirements. */ return FALSE; -- 2.30.2