Update fastfile class logic.

libs/fastfile/fastfile_cod2.cpp

@@ -1,7 +1,7 @@
 #include "fastfile_cod2.h"
 
 #include "utils.h"
-#include "compressor.h"
+#include "compression.h"
 #include "zonefile_cod2.h"
 
 #include <QFile>
@@ -15,6 +15,10 @@ FastFile_COD2::~FastFile_COD2() {
 
 }
 
+QByteArray FastFile_COD2::GetBinaryData() {
+    return QByteArray();
+}
+
 bool FastFile_COD2::Load(const QString aFilePath) {
     if (aFilePath.isEmpty()) {
         return false;
@@ -58,7 +62,7 @@ bool FastFile_COD2::Load(const QByteArray aData) {
 
     Utils::ReadUntilHex(&fastFileStream, "78");
     QByteArray compressedData = aData.mid(fastFileStream.device()->pos());
-    QByteArray decompressedData = Compressor::DecompressZLIB(compressedData);
+    QByteArray decompressedData = Compression::DecompressZLIB(compressedData);
 
     QDir exportsDir(QDir::currentPath());
     exportsDir.mkdir("exports");
@@ -71,7 +75,8 @@ bool FastFile_COD2::Load(const QByteArray aData) {
 
     // Load the zone file with the decompressed data (using an Xbox platform flag).
     ZoneFile_COD2 zoneFile;
-    zoneFile.Load(decompressedData, GetStem() + ".zone", FF_PLATFORM_XBOX);
+    zoneFile.SetStem(GetStem());
+    zoneFile.Load(decompressedData, FF_PLATFORM_XBOX);
     SetZoneFile(std::make_shared<ZoneFile_COD2>(zoneFile));
 
     return true;

libs/fastfile/fastfile_cod2.h

@@ -9,6 +9,8 @@ public:
     FastFile_COD2();
     ~FastFile_COD2();
 
+    QByteArray GetBinaryData() override;
+
     bool Load(const QString aFilePath) override;
     bool Load(const QByteArray aData) override;
 };

libs/fastfile/fastfile_cod5.cpp

@@ -2,7 +2,7 @@
 #include "zonefile_cod5.h"
 
 #include "utils.h"
-#include "compressor.h"
+#include "compression.h"
 #include "statusbarmanager.h"
 
 #include <QFile>
@@ -16,6 +16,10 @@ FastFile_COD5::~FastFile_COD5() {
 
 }
 
+QByteArray FastFile_COD5::GetBinaryData() {
+    return QByteArray();
+}
+
 bool FastFile_COD5::Load(const QString aFilePath) {
     StatusBarManager::instance().updateStatus("Loading COD5 Fast File w/path", 1000);
 
@@ -64,7 +68,7 @@ bool FastFile_COD5::Load(const QByteArray aData) {
     SetGame("COD5");
 
     // For COD5, simply decompress from offset 12.
-    decompressedData = Compressor::DecompressZLIB(aData.mid(12));
+    decompressedData = Compression::DecompressZLIB(aData.mid(12));
 
     Utils::ExportData(GetStem() + ".zone", decompressedData);
 
@@ -77,7 +81,7 @@ bool FastFile_COD5::Load(const QByteArray aData) {
 
     ZoneFile_COD5 zoneFile;
     zoneFile.SetStem(GetStem());
-    //zoneFile.Load(decompressedData, GetStem() + ".zone", platform);
+    zoneFile.Load(decompressedData, platform);
     SetZoneFile(std::make_shared<ZoneFile_COD5>(zoneFile));
 
     return true;

libs/fastfile/fastfile_cod5.h

@@ -9,6 +9,8 @@ public:
     FastFile_COD5();
     ~FastFile_COD5();
 
+    QByteArray GetBinaryData() override;
+
     bool Load(const QString aFilePath) override;
     bool Load(const QByteArray aData) override;
 };

libs/fastfile/fastfile_cod7.cpp

@@ -2,7 +2,8 @@
 #include "zonefile_cod7.h"
 
 #include "utils.h"
-#include "compressor.h"
+#include "compression.h"
+#include "encryption.h"
 
 #include <QFile>
 #include <QDebug>
@@ -15,6 +16,10 @@ FastFile_COD7::~FastFile_COD7() {
 
 }
 
+QByteArray FastFile_COD7::GetBinaryData() {
+    return QByteArray();
+}
+
 bool FastFile_COD7::Load(const QString aFilePath) {
     if (aFilePath.isEmpty()) {
         return false;
@@ -58,11 +63,14 @@ bool FastFile_COD7::Load(const QByteArray aData) {
     SetPlatform(pCalculateFFPlatform(version));
     SetGame("COD7");
 
+    // Load the zone file with the decompressed data (using an Xbox platform flag).
+    ZoneFile_COD7 zoneFile;
+    zoneFile.SetStem(GetStem());
+
     // For COD7/COD9, use BigEndian.
     fastFileStream.setByteOrder(QDataStream::BigEndian);
     if (GetPlatform() == "PC") {
         fastFileStream.setByteOrder(QDataStream::LittleEndian);
-    }
 
         // Select key based on game.
         QByteArray key;
@@ -128,14 +136,32 @@ bool FastFile_COD7::Load(const QByteArray aData) {
             compressedData.append(char(0x01));
             compressedData.append(decData);
 
-        decompressedData.append(Compressor::DecompressZLIB(compressedData));
+            decompressedData.append(Compression::DecompressZLIB(compressedData));
 
             sectionIndex++;
         }
 
-    // Load the zone file with the decompressed data (using an Xbox platform flag).
+        zoneFile.Load(decompressedData, FF_PLATFORM_XBOX);
-    ZoneFile_COD7 zoneFile;
+    } else if (GetPlatform() == "Wii") {
-    zoneFile.Load(decompressedData, GetStem() + ".zone", FF_PLATFORM_XBOX);
+        // For COD7, simply decompress from offset 12.
+        decompressedData = Compression::DecompressZLIB(aData.mid(12));
+
+        Utils::ExportData(GetStem() + ".zone", decompressedData);
+
+        QDir workingDir = QDir::currentPath();
+        workingDir.mkdir("exports");
+
+        QFile outputFile("exports/" + GetStem() + ".zone");
+        if (!outputFile.open(QIODevice::WriteOnly)) {
+            qDebug() << "Failed to extract IPAK file.";
+        }
+        qDebug() << "           - File Name: " << outputFile.fileName();
+        outputFile.write(decompressedData);
+        outputFile.close();
+
+        zoneFile.Load(decompressedData, FF_PLATFORM_WII);
+    }
+
     SetZoneFile(std::make_shared<ZoneFile_COD7>(zoneFile));
 
     return true;

libs/fastfile/fastfile_cod7.h

@@ -9,6 +9,8 @@ public:
     FastFile_COD7();
     ~FastFile_COD7();
 
+    QByteArray GetBinaryData() override;
+
     bool Load(const QString aFilePath) override;
     bool Load(const QByteArray aData) override;
 };

libs/fastfile/fastfile_cod9.cpp

@@ -1,8 +1,6 @@
 #include "fastfile_cod9.h"
 #include "zonefile_cod9.h"
-
+#include "encryption.h"
-#include "utils.h"
-#include "compressor.h"
 
 #include <QFile>
 #include <QDebug>
@@ -15,6 +13,10 @@ FastFile_COD9::~FastFile_COD9() {
 
 }
 
+QByteArray FastFile_COD9::GetBinaryData() {
+    return QByteArray();
+}
+
 bool FastFile_COD9::Load(const QString aFilePath) {
     if (aFilePath.isEmpty()) {
         return false;
@@ -104,7 +106,8 @@ bool FastFile_COD9::Load(const QByteArray aData) {
 
     // Load the zone file with the decompressed data (using an Xbox platform flag).
     ZoneFile_COD9 zoneFile;
-    zoneFile.Load(decompressedData, GetStem() + ".zone", FF_PLATFORM_PC);
+    zoneFile.SetStem(GetStem());
+    zoneFile.Load(decompressedData, FF_PLATFORM_PC);
     SetZoneFile(std::make_shared<ZoneFile_COD9>(zoneFile));
 
     return true;

libs/fastfile/fastfile_cod9.h

@@ -9,6 +9,8 @@ public:
     FastFile_COD9();
     ~FastFile_COD9();
 
+    QByteArray GetBinaryData() override;
+
     bool Load(const QString aFilePath) override;
     bool Load(const QByteArray aData) override;
 };