Removed addr translation when is asset is segmented

HarbourMasters · Feb 18, 2024 · 752c6a2 · 752c6a2
1 parent 8f7f877
commit 752c6a2
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/src/factories/DisplayListFactory.cpp b/src/factories/DisplayListFactory.cpp
@@ -299,7 +299,8 @@ std::optional<std::shared_ptr<IParsedData>> DListFactory::parse(std::vector<uint
 
                 if(Decompressor::IsSegmented(w1)){
                     SPDLOG_INFO("Found segmented display list at 0x{:X}", w1);
-                    output = Companion::Instance->NormalizeAsset("seg" + std::to_string(SEGMENT_NUMBER(w1)) +"_dl_" + Torch::to_hex(ptr, false));
+                    ptr = w1;
+                    output = Companion::Instance->NormalizeAsset("seg" + std::to_string(SEGMENT_NUMBER(w1)) +"_dl_" + Torch::to_hex(SEGMENT_OFFSET(ptr), false));
                 } else {
                     SPDLOG_INFO("Found display list at 0x{:X}", ptr);
                     output = Companion::Instance->NormalizeAsset("dl_" + Torch::to_hex(w1, false));
@@ -356,7 +357,8 @@ std::optional<std::shared_ptr<IParsedData>> DListFactory::parse(std::vector<uint
 
                 if(Decompressor::IsSegmented(w1)){
                     SPDLOG_INFO("Found segmented lights at 0x{:X}", w1);
-                    output = Companion::Instance->NormalizeAsset("seg" + std::to_string(SEGMENT_NUMBER(w1)) +"_lights1_" + Torch::to_hex(ptr, false));
+                    ptr = w1;
+                    output = Companion::Instance->NormalizeAsset("seg" + std::to_string(SEGMENT_NUMBER(w1)) +"_lights1_" + Torch::to_hex(SEGMENT_OFFSET(ptr), false));
                 } else {
                     SPDLOG_INFO("Found lights at 0x{:X}", ptr);
                     output = Companion::Instance->NormalizeAsset("lights1_" + Torch::to_hex(w1, false));
@@ -403,7 +405,8 @@ std::optional<std::shared_ptr<IParsedData>> DListFactory::parse(std::vector<uint
 
                 if(Decompressor::IsSegmented(w1)){
                     SPDLOG_INFO("Found segmented vtx at 0x{:X}", ptr);
-                    output = Companion::Instance->NormalizeAsset("seg" + std::to_string(SEGMENT_NUMBER(w1)) +"_vtx_" + Torch::to_hex(ptr, false));
+                    ptr = w1;
+                    output = Companion::Instance->NormalizeAsset("seg" + std::to_string(SEGMENT_NUMBER(w1)) +"_vtx_" + Torch::to_hex(SEGMENT_OFFSET(ptr), false));
                 } else {
                     SPDLOG_INFO("Found vtx at 0x{:X}", ptr);
                     output = Companion::Instance->NormalizeAsset("vtx_" + Torch::to_hex(w1, false));