From 2168b602e9eac413674bc8c8d46eefaaee48ca08 Mon Sep 17 00:00:00 2001 From: Jonas Volman Date: Tue, 14 Jul 2026 17:37:35 -0700 Subject: [PATCH] Match multiplayer scenario list lookup --- source/scenario/multiplayer_scenario_description.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/source/scenario/multiplayer_scenario_description.c b/source/scenario/multiplayer_scenario_description.c index 83f4533c..af9d5415 100644 --- a/source/scenario/multiplayer_scenario_description.c +++ b/source/scenario/multiplayer_scenario_description.c @@ -64,6 +64,7 @@ struct multiplayer_scenario_description_item *multiplayer_scenario_description_g short *count) { long scenario_list_index; + struct multiplayer_scenario_description_item *result; match_assert("c:\\halo\\SOURCE\\scenario\\multiplayer_scenario_description.c", 60, count); scenario_list_index = tag_loaded(MULTIPLAYER_SCENARIO_DESCRIPTION_TAG, "ui\\multiplayer_scenarios"); @@ -71,16 +72,18 @@ struct multiplayer_scenario_description_item *multiplayer_scenario_description_g { struct multiplayer_scenario_description *scenario_list = tag_get(MULTIPLAYER_SCENARIO_DESCRIPTION_TAG, scenario_list_index); - struct multiplayer_scenario_description_item *result; match_assert("c:\\halo\\SOURCE\\scenario\\multiplayer_scenario_description.c", 66, scenario_list); result = scenario_list->scenarios.address; *count = (short)scenario_list->scenarios.count; - return result; + } + else + { + result = NULL; + *count = 0; } - *count = 0; - return NULL; + return result; } boolean map_name_from_multiplayer_scenario_description_item(