From 773c76ece5dd615836c8802fceb6553fe15159ad Mon Sep 17 00:00:00 2001 From: theTwister <6237734+twist84@users.noreply.github.com> Date: Mon, 9 Sep 2024 10:58:44 +0100 Subject: [PATCH] Updated `s_multiplayer_customized_model_character` --- game/source/game/multiplayer_definitions.cpp | 2 +- game/source/game/multiplayer_definitions.hpp | 2 +- game/source/game/players.cpp | 8 ++++---- game/source/hf2p/hf2p.cpp | 8 ++++---- game/source/scenario/scenario.cpp | 6 +++--- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/game/source/game/multiplayer_definitions.cpp b/game/source/game/multiplayer_definitions.cpp index f772a0ef8..1d6e45449 100644 --- a/game/source/game/multiplayer_definitions.cpp +++ b/game/source/game/multiplayer_definitions.cpp @@ -114,7 +114,7 @@ void s_multiplayer_universal_globals_definition::update_reference_names() void s_multiplayer_customized_model_character::update_reference_names() { - UPDATE_BLOCK_REFERENCE_NAMES(customized_areas); + UPDATE_BLOCK_REFERENCE_NAMES(customized_selection); } void s_multiplayer_customized_model_selection::update_reference_names() diff --git a/game/source/game/multiplayer_definitions.hpp b/game/source/game/multiplayer_definitions.hpp index 1b8cf7db8..9931b7c0d 100644 --- a/game/source/game/multiplayer_definitions.hpp +++ b/game/source/game/multiplayer_definitions.hpp @@ -75,7 +75,7 @@ struct s_multiplayer_customized_model_character { c_string_id armor_region; c_string_id biped_region; - c_typed_tag_block customized_areas; + c_typed_tag_block customized_selection; void update_reference_names(); }; diff --git a/game/source/game/players.cpp b/game/source/game/players.cpp index a6b0124a3..53fb49191 100644 --- a/game/source/game/players.cpp +++ b/game/source/game/players.cpp @@ -837,9 +837,9 @@ long customized_spartan_character_from_name(s_multiplayer_customized_model_chara if (armor_region && csstricmp(region_or_biped_name, armor_region) == 0) { - for (long selection_absolute_index = 0; selection_absolute_index < character.customized_areas.count; selection_absolute_index++) + for (long selection_absolute_index = 0; selection_absolute_index < character.customized_selection.count; selection_absolute_index++) { - s_multiplayer_customized_model_selection& customized_model_selection = character.customized_areas[selection_absolute_index]; + s_multiplayer_customized_model_selection& customized_model_selection = character.customized_selection[selection_absolute_index]; if (customized_area_selection_from_name(customized_model_selection, selection_name)) return selection_absolute_index; } @@ -847,9 +847,9 @@ long customized_spartan_character_from_name(s_multiplayer_customized_model_chara if (biped_region && csstricmp(region_or_biped_name, biped_region) == 0) { - for (long selection_absolute_index = 0; selection_absolute_index < character.customized_areas.count; selection_absolute_index++) + for (long selection_absolute_index = 0; selection_absolute_index < character.customized_selection.count; selection_absolute_index++) { - s_multiplayer_customized_model_selection& customized_model_selection = character.customized_areas[selection_absolute_index]; + s_multiplayer_customized_model_selection& customized_model_selection = character.customized_selection[selection_absolute_index]; if (customized_area_selection_from_name(customized_model_selection, selection_name)) return selection_absolute_index; } diff --git a/game/source/hf2p/hf2p.cpp b/game/source/hf2p/hf2p.cpp index e4d82933a..869bf7031 100644 --- a/game/source/hf2p/hf2p.cpp +++ b/game/source/hf2p/hf2p.cpp @@ -338,9 +338,9 @@ c_static_array, 100>, k_armor_type_count>& ge continue; } - for (long i = 0; i < customized_spartan_character.customized_areas.count; i++) + for (long i = 0; i < customized_spartan_character.customized_selection.count; i++) { - s_multiplayer_customized_model_selection& customized_area = customized_spartan_character.customized_areas[i]; + s_multiplayer_customized_model_selection& customized_area = customized_spartan_character.customized_selection[i]; // you can only see the arms in first person if (ignore_requirements || customized_area.third_person_armor_object.index != NONE /*&& customized_area.first_person_armor_object.index != NONE*/) @@ -390,9 +390,9 @@ c_static_array, 100>, k_armor_type_count>& ge continue; } - for (long i = 0; i < customized_elite_character.customized_areas.count; i++) + for (long i = 0; i < customized_elite_character.customized_selection.count; i++) { - s_multiplayer_customized_model_selection& customized_area = customized_elite_character.customized_areas[i]; + s_multiplayer_customized_model_selection& customized_area = customized_elite_character.customized_selection[i]; // you can only see the arms in first person if (customized_area.third_person_armor_object.index != NONE /*&& customized_area.first_person_armor_object.index != NONE*/) diff --git a/game/source/scenario/scenario.cpp b/game/source/scenario/scenario.cpp index 270d209d9..5f4bd7a54 100644 --- a/game/source/scenario/scenario.cpp +++ b/game/source/scenario/scenario.cpp @@ -1028,10 +1028,10 @@ if (universal_data->customized_##NAME##_characters.count)\ char const* biped_region = customized_character.biped_region.get_string();\ if (biped_region && *biped_region)\ c_console::write_line(" biped region: %s", biped_region);\ - if (customized_character.customized_areas.count)\ + if (customized_character.customized_selection.count)\ {\ - c_console::write_line(" customized areas: %d", customized_character.customized_areas.count);\ - for (auto customized_area : customized_character.customized_areas)\ + c_console::write_line(" customized areas: %d", customized_character.customized_selection.count);\ + for (auto customized_area : customized_character.customized_selection)\ {\ char const* selection_name = customized_area.selection_name.get_string();\ if (selection_name && *selection_name)\