bolt: Table lookup only done with Simpsons Skateboarding

lib/bolt/Reader.cpp

@@ -2,12 +2,12 @@
 
 #include <base/MmapFile.hpp>
 #include <bolt/Reader.hpp>
-
 #include <structs/BoltStructs.hpp>
 
 namespace lightningbolt {
 
 	struct BoltReader::Impl {
+		Impl(Game game) : game(game) {}
 
 		ErrorOr<void> OpenBolt(const fs::path& path) {
 			// Load the BOLT file
@@ -19,6 +19,7 @@ namespace lightningbolt {
 			if(!lib->Validate())
 				return std::make_error_code(BoltErrc::InvalidMagic);
 
+			if(game == Game::SimpsonsSkateboarding) {
 				auto p = path;
 				p.replace_filename("SLUS_201.14");
 
@@ -27,11 +28,13 @@ namespace lightningbolt {
 
 				// Load table entries.
 				GetTableEntries();
+			}
 
 			return {};
 		}
 
 		const std::vector<BoltReader::File>& GetTableEntries() {
+			if(game == Game::SimpsonsSkateboarding) {
 				if(entryTable.empty()) {
 					auto* base = elfFile.GetMapping();
 					auto* table = std::bit_cast<elf::BoltTableEntry*>(base + elf::BoltTableOffsets.usTable);
@@ -51,6 +54,7 @@ namespace lightningbolt {
 						table++;
 					}
 				}
+			}
 			return entryTable;
 		}
 
@@ -75,6 +79,7 @@ namespace lightningbolt {
 		}
 
 	   private:
+		Game game;
 		std::vector<BoltReader::File> entryTable;
 		MmapFile elfFile;
 		MmapFile boltFile;
@@ -82,8 +87,8 @@ namespace lightningbolt {
 		BoltLibraryHeader* lib;
 	};
 
-	BoltReader::BoltReader():
+	BoltReader::BoltReader(Game game) : impl(std::make_unique<Impl>(game)) {
-		impl(std::make_unique<Impl>()) {}
+	}
 
 	BoltReader::~BoltReader() = default;
 
@@ -92,9 +97,7 @@ namespace lightningbolt {
 	}
 
 	void BoltReader::ForEachFile(std::function<bool(File&)> f) {
-		impl->ForEachFile([&f](auto& file) {
+		impl->ForEachFile([&f](auto& file) { return f(file); });
-			return f(file);
-		});
 	}
 
 } // namespace lightningbolt

lib/bolt/Reader.hpp

@@ -6,6 +6,12 @@
 namespace lightningbolt {
 
 	struct BoltReader {
+		enum class Game {
+			LooseBolt, ///< Use this for games with no bolt entry
+			SimpsonsSkateboarding,
+			NamcoMuseumGCN = LooseBolt
+		};
+
 		struct File {
 			std::string_view filename;
 			u16 index;
@@ -15,10 +21,9 @@ namespace lightningbolt {
 
 			u8* uncompressedData { nullptr };
 			usize uncompressedSize;
-
 		};
 
-		BoltReader();
+		BoltReader(Game game = Game::SimpsonsSkateboarding);
 		~BoltReader();
 
 		ErrorOr<void> OpenBolt(const fs::path& path);

lib/structs/BoltStructs.hpp

@@ -7,6 +7,7 @@
 
 namespace lightningbolt {
 
+	/// Elf structures, only applicable to Simpsons Skateboarding
 	namespace elf {
 
 		/// Table entry in the ELF. We use this to create file names.