Merge pull request #353 from klingbolt/trail_inheritance_bug

Fixed a bug that caused trails to not inherit attributes correctly
AsherGlick · Sep 22, 2024 · 2b6308b · 2b6308b
2 parents 77f2d6f + f7bcbd0
commit 2b6308b
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 2 deletions.
diff --git a/...ntegration_tests/test_cases/xml_category_inheritance/input/pack/texture_one.png b/...ntegration_tests/test_cases/xml_category_inheritance/input/pack/texture_one.png
diff --git a/xml_converter/integration_tests/test_cases/xml_category_inheritance/input/pack/trail.trl b/xml_converter/integration_tests/test_cases/xml_category_inheritance/input/pack/trail.trl
diff --git a/xml_converter/integration_tests/test_cases/xml_category_inheritance/input/pack/xml_file.xml b/xml_converter/integration_tests/test_cases/xml_category_inheritance/input/pack/xml_file.xml
@@ -7,8 +7,13 @@
         </MarkerCategory>
     </MarkerCategory>
 
+    <MarkerCategory Name="TrailNestedLevel1" Texture="texture_one.png" TrailData="trail.trl" AnimationSpeed="1">
+        <MarkerCategory Name="TrailNestedLevel2"></MarkerCategory>
+    </MarkerCategory>
+
     <MarkerCategory Name="NestedLevel1" XPos="111"></MarkerCategory>
 
+
     <POIs>
         <POI Type="mycategory" MapID="50" />
         <POI Type="mycategory" XPos="170.81" MapID="50" />
@@ -17,5 +22,6 @@
         <POI Type="nestedlevel1" MapID="50" />
         <POI Type="nestedlevel1.nestedlevel2" MapID="50" />
         <POI Type="nestedlevel1.nestedlevel2.nestedlevel3" MapID="50" />
+        <Trail Type="trailnestedlevel1.trailnestedlevel2" />
     </POIs>
 </OverlayData>
diff --git a/xml_converter/integration_tests/test_cases/xml_category_inheritance/output_proto/markers.bin b/xml_converter/integration_tests/test_cases/xml_category_inheritance/output_proto/markers.bin
diff --git a/...egration_tests/test_cases/xml_category_inheritance/output_proto/texture_one.png b/...egration_tests/test_cases/xml_category_inheritance/output_proto/texture_one.png
diff --git a/...ter/integration_tests/test_cases/xml_category_inheritance/output_xml/037aa160e392f1c8.trl b/...ter/integration_tests/test_cases/xml_category_inheritance/output_xml/037aa160e392f1c8.trl
diff --git a/...ntegration_tests/test_cases/xml_category_inheritance/output_xml/texture_one.png b/...ntegration_tests/test_cases/xml_category_inheritance/output_xml/texture_one.png
diff --git a/xml_converter/integration_tests/test_cases/xml_category_inheritance/output_xml/xml_file.xml b/xml_converter/integration_tests/test_cases/xml_category_inheritance/output_xml/xml_file.xml
@@ -9,12 +9,18 @@
 </MarkerCategory>
 </MarkerCategory>
 
+<MarkerCategory  ID="c+9VhmatoOU=" Name="TrailNestedLevel1">
+	<MarkerCategory  ID="8UCi0C+KhAE=" Name="TrailNestedLevel2">
+</MarkerCategory>
+</MarkerCategory>
+
 <POIs>
 <POI  Type="mycategory" MapID="50" XPos="169.809998" YPos="210.649994" ZPos="215.830002"/>
 <POI  Type="mycategory" MapID="50" XPos="170.809998" YPos="210.649994" ZPos="215.830002"/>
 <POI  Type="mycategory" MapID="50" XPos="169.809998" YPos="211.649994" ZPos="215.830002"/>
 <POI  Type="nestedlevel1" MapID="50" XPos="111.000000" YPos="0.000000" ZPos="0.000000"/>
 <POI  Type="nestedlevel1.nestedlevel2" MapID="50" XPos="111.000000" YPos="222.000000" ZPos="0.000000"/>
 <POI  Type="nestedlevel1.nestedlevel2.nestedlevel3" MapID="50" XPos="111.000000" YPos="222.000000" ZPos="333.000000"/>
+<Trail  AnimSpeed="1.000000" Type="trailnestedlevel1.trailnestedlevel2" MapID="50" Texture="texture_one.png" TrailData="037aa160e392f1c8.trl"/>
 </POIs>
 </OverlayData>
diff --git a/xml_converter/src/packaging_xml.cpp b/xml_converter/src/packaging_xml.cpp
@@ -166,9 +166,9 @@ vector<Parseable*> parse_pois(rapidxml::xml_node<>* root_node, map<string, Categ
             Trail* trail = new Trail();
 
             for (size_t category_index = 0; category_index < categories.size(); category_index++) {
-                for (size_t i = 0; i < categories[category_index]->icon_attributes.size(); i++) {
+                for (size_t i = 0; i < categories[category_index]->trail_attributes.size(); i++) {
                     trail->init_xml_attribute(
-                        categories[category_index]->icon_attributes[i],
+                        categories[category_index]->trail_attributes[i],
                         &ignored_errors,
                         state);
                 }