fix map image loading

matiascalegaris · Nov 7, 2023 · bf95888 · bf95888
1 parent 4e4f33a
commit bf95888
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 2 deletions.
diff --git a/BabelSlave/FileSystem.cpp b/BabelSlave/FileSystem.cpp
@@ -88,6 +88,10 @@ namespace Babel {
             mCompressedMiniMaps = std::make_unique<AO::Compressor>();
             mCompressedMiniMaps->Open(GetFilePath("OUTPUT/MiniMapas").u8string().c_str(),
                 "ht5PutasTdyRk6BSJcucumelo234583013lalivn2FRjYYBzPhnMrkmUfLMgm4TDX");
+
+            mCompressedInterface = std::make_unique<AO::Compressor>();
+            mCompressedInterface->Open(GetFilePath("OUTPUT/Interface").u8string().c_str(),
+                "ht5PutasTdyRk6BSJcucumelo234583013lalivn2FRjYYBzPhnMrkmUfLMgm4TDX");
         }
         sActiveFS = this;
     }
@@ -119,6 +123,11 @@ namespace Babel {
                 file = file.substr(start);
                 return mCompressedMiniMaps->HasFile(file.c_str());
             }
+            if (file.rfind("/Interface/", 0) == 0) {
+                auto start = file.rfind("/") + 1;
+                file = file.substr(start);
+                return mCompressedInterface->HasFile(file.c_str());
+            }
         }
         return getFindData(GetRelative(path).get(), findData);
     }
@@ -207,6 +216,16 @@ namespace Babel {
                 return Buffer::Create(it.first->second->data.data(), it.first->second->data.size(), it.first->second.get(),
                     FileSystemWin_DestroyDecompressedFileData);
             }
+            if (file.rfind("/Interface/", 0) == 0) {
+                auto start = file.rfind("/") + 1;
+                file = file.substr(start);
+                mNextIndex++;
+                auto it = mOpenFileMap.insert(std::make_pair(mNextIndex, std::make_unique<CompressedData>()));
+                it.first->second->Id = mNextIndex;
+                mCompressedInterface->GetFileData(file.c_str(), it.first->second->data);
+                return Buffer::Create(it.first->second->data.data(), it.first->second->data.size(), it.first->second.get(),
+                    FileSystemWin_DestroyDecompressedFileData);
+            }
         }
         hFile = CreateFileW(pathStr.get(),
             GENERIC_READ,          // dwDesiredAccess

diff --git a/BabelSlave/FileSystem.h b/BabelSlave/FileSystem.h
@@ -44,6 +44,8 @@ namespace Babel {
 		std::unique_ptr<AO::Compressor> mCompressedGraphics;
 		std::unique_ptr<AO::Compressor> mCompressedInit;
 		std::unique_ptr<AO::Compressor> mCompressedMiniMaps;
+		std::unique_ptr<AO::Compressor> mCompressedMaps;
+		std::unique_ptr<AO::Compressor> mCompressedInterface;
 		int mNextIndex = { 0 };
 		std::map<int, std::unique_ptr<CompressedData>> mOpenFileMap;
 	};

diff --git a/BabelSlave/html/static/css/main.css b/BabelSlave/html/static/css/main.css
diff --git a/BabelSlave/html/static/js/main.js b/BabelSlave/html/static/js/main.js