From 7b9d8efed19d51dd3c036137eb8f536c5c63119b Mon Sep 17 00:00:00 2001 From: bombasticSlacks Date: Sat, 29 Jan 2022 10:11:22 -0400 Subject: [PATCH] more specific checking in layering conflicts --- src/character_attire.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/character_attire.cpp b/src/character_attire.cpp index 5e8462492996f..23cd7330183e4 100644 --- a/src/character_attire.cpp +++ b/src/character_attire.cpp @@ -805,9 +805,11 @@ static void layer_item( std::map &vals, const ite bool conflicts = false; // add the sublocations to the overall body part layer and update if we are conflicting - if( it.has_sublocations() && item_layer >= highest_layer_so_far[bp] ) { + if( !bp->sub_parts.empty() && item_layer >= highest_layer_so_far[bp] ) { conflicts = vals[bp].add_sub_locations( item_layer, it.get_covered_sub_body_parts() ); } else { + // the body part doesn't have sublocations it for sure conflicts + // if its on the wrong layer it for sure conflicts conflicts = true; }