Previous test worked by accident. Made an addition to a previous test…

… that does similar things
AsherGlick · Sep 12, 2024 · 7364bd8 · 7364bd8
1 parent a087e5e
commit 7364bd8
Show file tree

Hide file tree

Showing 13 changed files with 7 additions and 28 deletions.
diff --git a/...ml_inheritance/input/pack/texture_one.png → ...ry_inheritance/input/pack/texture_one.png b/...ml_inheritance/input/pack/texture_one.png → ...ry_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
@@ -1,7 +1,7 @@
 <OverlayData>
     <MarkerCategory Name="mycategory" XPos="169.81" YPos="210.65" ZPos="215.83"></MarkerCategory>
 
-    <MarkerCategory Name="NestedLevel1" XPos="000" MapID="999">
+    <MarkerCategory Name="NestedLevel1" XPos="000" MapID="999" IconFile="texture_one.png" Texture="texture_one.png" TrailData="trail.trl" AnimationSpeed="1">
         <MarkerCategory Name="NestedLevel2" YPos="222">
             <MarkerCategory Name="NestedLevel3" ZPos="333"></MarkerCategory>
         </MarkerCategory>
@@ -17,5 +17,6 @@
         <POI Type="nestedlevel1" MapID="50" />
         <POI Type="nestedlevel1.nestedlevel2" MapID="50" />
         <POI Type="nestedlevel1.nestedlevel2.nestedlevel3" MapID="50" />
+        <Trail Type="nestedlevel1.nestedlevel2.nestedlevel3" />
     </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/..._inheritance/output_proto/texture_one.png → ..._inheritance/output_proto/texture_one.png b/..._inheritance/output_proto/texture_one.png → ..._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/...ml_inheritance/output_xml/texture_one.png → ...ry_inheritance/output_xml/texture_one.png b/...ml_inheritance/output_xml/texture_one.png → ...ry_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
@@ -13,8 +13,9 @@
 <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"/>
+<POI  Type="nestedlevel1" IconFile="texture_one.png" MapID="50" XPos="111.000000" YPos="0.000000" ZPos="0.000000"/>
+<POI  Type="nestedlevel1.nestedlevel2" IconFile="texture_one.png" MapID="50" XPos="111.000000" YPos="222.000000" ZPos="0.000000"/>
+<POI  Type="nestedlevel1.nestedlevel2.nestedlevel3" IconFile="texture_one.png" MapID="50" XPos="111.000000" YPos="222.000000" ZPos="333.000000"/>
+<Trail  AnimSpeed="1.000000" Type="nestedlevel1.nestedlevel2.nestedlevel3" MapID="50" Texture="texture_one.png" TrailData="037aa160e392f1c8.trl"/>
 </POIs>
 </OverlayData>
diff --git a/xml_converter/integration_tests/test_cases/xml_inheritance/input/pack/xml_file.xml b/xml_converter/integration_tests/test_cases/xml_inheritance/input/pack/xml_file.xml
diff --git a/xml_converter/integration_tests/test_cases/xml_inheritance/output_proto/markers.bin b/xml_converter/integration_tests/test_cases/xml_inheritance/output_proto/markers.bin
diff --git a/xml_converter/integration_tests/test_cases/xml_inheritance/output_xml/xml_file.xml b/xml_converter/integration_tests/test_cases/xml_inheritance/output_xml/xml_file.xml
diff --git a/xml_converter/integration_tests/test_cases/xml_inheritance/testcase.yaml b/xml_converter/integration_tests/test_cases/xml_inheritance/testcase.yaml
diff --git a/xml_converter/src/packaging_xml.cpp b/xml_converter/src/packaging_xml.cpp
@@ -166,7 +166,7 @@ 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]->trail_attributes[i],
                         &ignored_errors,