Fixed paths in headers

include/DatSubsystems/DatFileSystem.h

@@ -64,14 +64,13 @@ namespace LOTRO_DAT {
 
         DatOperationResult<> PerformOperationOnAllFiles(const std::function<void (std::shared_ptr<SubFile>&)>& function);
 
-    private:
+        DatOperationResult<> CommitDirectories();
 
+    private:
         DatOperationResult<> InitSubFile(long long file_id);
 
         DatOperationResult<> InitSubDirectory(SubDirectory dir);
 
-        DatOperationResult<> CommitDirectories();
-
     private:
         DatFile *dat;
         std::set<long long> subfile_pending_update;

include/DatSubsystems/DatPatcher.h

@@ -5,7 +5,7 @@
 #ifndef LOTRO_DAT_LIBRARY_DATPATCHER_H
 #define LOTRO_DAT_LIBRARY_DATPATCHER_H
 
-#include "yaml-cpp/yaml.h"
+#include <yaml-cpp/yaml.h>
 #include "../DatOperationResult.h"
 
 extern "C++"

include/SubFile.h

@@ -7,7 +7,7 @@
 
 #include <string>
 #include <vector>
-#include "yaml-cpp/yaml.h"
+#include <yaml-cpp/yaml.h>
 
 extern "C++"
 {

include/SubfileData.h

@@ -10,7 +10,7 @@
 #include "BinaryData.h"
 
 namespace LOTRO_DAT {
-    struct SubfileData {
+    class SubfileData {
     public:
         SubfileData() {
             binary_data = BinaryData(0);

include/Subfiles/DdsSubFile.h

@@ -5,7 +5,7 @@
 #ifndef LOTRO_DAT_LIBRARY_DDSSUBFILE_H
 #define LOTRO_DAT_LIBRARY_DDSSUBFILE_H
 
-#include "SubFile.h"
+#include "../SubFile.h"
 
 namespace LOTRO_DAT {
     class DdsSubFile : public SubFile {

include/Subfiles/FontSubFile.h

@@ -6,7 +6,7 @@
 #define LOTRO_DAT_LIBRARY_FONTSUBFILE_H
 
 
-#include "SubFile.h"
+#include "../SubFile.h"
 
 namespace LOTRO_DAT {
     class FontSubFile : public SubFile {

include/Subfiles/JpgSubFile.h

@@ -6,7 +6,7 @@
 #define LOTRO_DAT_LIBRARY_JPGSUBFILE_H
 
 
-#include "SubFile.h"
+#include "../SubFile.h"
 
 namespace LOTRO_DAT {
     class JpgSubFile : public SubFile {

include/Subfiles/OggSubFile.h

@@ -5,7 +5,7 @@
 #ifndef LOTRO_DAT_LIBRARY_OGGSUBFILE_H
 #define LOTRO_DAT_LIBRARY_OGGSUBFILE_H
 
-#include "SubFile.h"
+#include "../SubFile.h"
 
 namespace LOTRO_DAT {
     class OggSubFile : public SubFile {

include/Subfiles/TextSubFile.h

@@ -5,9 +5,9 @@
 #ifndef LOTRO_DAT_LIBRARY_TEXTSUBFILE_H
 #define LOTRO_DAT_LIBRARY_TEXTSUBFILE_H
 
-#include "SubFile.h"
-#include "SubfileData.h"
-#include "BinaryData.h"
+#include "../SubFile.h"
+#include "../SubfileData.h"
+#include "../BinaryData.h"
 
 #include <vector>
 #include <unordered_map>

include/Subfiles/UnknownSubFile.h

@@ -5,7 +5,7 @@
 #ifndef LOTRO_DAT_LIBRARY_UNKNOWNSUBFILE_H
 #define LOTRO_DAT_LIBRARY_UNKNOWNSUBFILE_H
 
-#include "SubFile.h"
+#include "../SubFile.h"
 
 namespace LOTRO_DAT {
     class UnknownSubFile : public SubFile {

include/Subfiles/WavSubFile.h

@@ -5,7 +5,7 @@
 #ifndef LOTRO_DAT_LIBRARY_WAVSUBFILE_H
 #define LOTRO_DAT_LIBRARY_WAVSUBFILE_H
 
-#include "SubFile.h"
+#include "../SubFile.h"
 
 namespace LOTRO_DAT {
     class WavSubFile : public SubFile {

src/SubFile.cpp

@@ -20,7 +20,6 @@
 
 
 #include <algorithm>
-#include <SubFile.h>
 
 
 const long long MAXSIZE = 50ll * 1024ll * 1024ll; // Setting maximal file size 50 MB; Files with size more than 50 mb
@@ -46,7 +45,7 @@ namespace LOTRO_DAT {
         unknown2_ = header.ToNumber<4>(28); // unknown2
 
         if (file_size_ > MAXSIZE) {
-            LOG(ERROR) << "Bad SubFile::SubFile() - File size of file " << file_id << " with offset " << file_offset
+            LOG(ERROR) << "Bad SubFile::SubFile() - File size of file " << file_id_ << " with offset " << file_offset_
                        << " is too much... Maybe it's incorrect..?";
             file_id_ = -1;
             return;
@@ -201,6 +200,8 @@ namespace LOTRO_DAT {
                 return std::dynamic_pointer_cast<SubFile>(std::make_shared<FontSubFile>(preinit_file));
             case UNKNOWN:
                 return std::dynamic_pointer_cast<SubFile>(std::make_shared<UnknownSubFile>(preinit_file));
+            case NO_TYPE:
+                return std::shared_ptr<SubFile>();
         }
         LOG(ERROR) << "Incorrect file type..";
         return std::dynamic_pointer_cast<SubFile>(std::make_shared<UnknownSubFile>(preinit_file));