From 934fa930fa8b29fa13ff22058ccb4239df46d38e Mon Sep 17 00:00:00 2001 From: Sveinung Kvilhaugsvik Date: Fri, 11 Jun 2021 10:36:38 +0200 Subject: [PATCH 11/14] diplrel_found(): make usable for DiplRel like. Prepare diplrel_found() to be used by other diplomatic status requirement types than DiplRel. See osdn #42513 --- common/requirements.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/common/requirements.c b/common/requirements.c index 3f0d643a35..eca1ffd4ca 100644 --- a/common/requirements.c +++ b/common/requirements.c @@ -4978,7 +4978,10 @@ static enum req_item_found action_found(const struct requirement *preq, static enum req_item_found diplrel_found(const struct requirement *preq, const struct universal *source) { - if (preq->source.kind == VUT_DIPLREL) { + fc_assert_ret_val(source->kind == VUT_DIPLREL, + ITF_NOT_APPLICABLE); + + if (preq->source.kind == source->kind) { if (preq->source.value.diplrel == source->value.diplrel) { /* The diplrel itself. */ return ITF_YES; -- 2.30.2