Fixed possible conflicts with LUS

2 files changed, 5 insertions, 3 deletions

diff --git a/src/n64/Cartridge.cpp b/src/n64/Cartridge.cpp
index f725f86..3580d11 100644
--- a/src/n64/Cartridge.cpp
+++ b/src/n64/Cartridge.cpp
@@ -5,7 +5,7 @@
 
 void N64::Cartridge::Initialize() {
     LUS::BinaryReader reader((char*) this->gRomData.data(), this->gRomData.size());
-    reader.SetEndianness(LUS::Endianness::Big);
+    reader.SetEndianness(Torch::Endianness::Big);
     reader.Seek(0x10, LUS::SeekOffsetType::Start);
     this->gRomCRC = BSWAP32(reader.ReadUInt32());
     reader.Seek(0x20, LUS::SeekOffsetType::Start);
diff --git a/src/n64/Cartridge.h b/src/n64/Cartridge.h
index 82dd5b1..4477a59 100644
--- a/src/n64/Cartridge.h
+++ b/src/n64/Cartridge.h
@@ -14,8 +14,10 @@ enum class CountryCode {
 
 class Cartridge {
 public:
-    explicit Cartridge(const std::vector<uint8_t>& romData) : gRomData(romData), gCountryCode(CountryCode::Unknown), gVersion(0), gGameTitle("Unknown") {}
-    void Initialize();
+    explicit Cartridge(const std::vector<uint8_t>& romData)
+      : gRomData(romData), gCountryCode(CountryCode::Unknown), gVersion(0), gGameTitle("Unknown"), gRomCRC(0) {
+  }
+  void Initialize();
     const std::string& GetGameTitle();
     std::string GetCountryCode();
     CountryCode GetCountry();