Merge pull request #4 from MHesham/master

Fix many serialization bugs
RtsAiResearch · Mar 26, 2014 · 4d595d3 · 4d595d3
2 parents cda5b2d + 8e32c4c
commit 4d595d3
Show file tree

Hide file tree

Showing 43 changed files with 363 additions and 1,317 deletions.
diff --git a/ObjectSerializer/Include/Container.h b/ObjectSerializer/Include/Container.h
@@ -2,18 +2,29 @@
 #define CONTAINER_H
 
 #ifndef SERIALIZABLE_H
-    #include "Serializable.h"
+    #include "ISerializable.h"
 #endif
 
 namespace Serialization
 {
-    class Container : public Serializable
+    class Container : public ISerializable
     {
     public:
+        enum Cookie
+        {
+            DefaultCtor     = 0xfeedbeef,
+        };
+
+        Container() : m_cookie(DefaultCtor), m_objID(++sm_lastSerializableObjID) {}
+
         virtual int         ContainerCount()    = 0;
         virtual void        Clear()             = 0;
         virtual void        AddTemp()           = 0;
         virtual char*       GetTemp()           = 0;
+
+    private:
+        Cookie m_cookie;
+        size_t m_objID;
     };
 }
 #endif // CONTAINER_H
diff --git a/ObjectSerializer/Include/Container/Container.h b/ObjectSerializer/Include/Container/Container.h
diff --git a/ObjectSerializer/Include/Container/SMap.h b/ObjectSerializer/Include/Container/SMap.h
diff --git a/ObjectSerializer/Include/Container/SPair.h b/ObjectSerializer/Include/Container/SPair.h
diff --git a/ObjectSerializer/Include/Container/SSet.h b/ObjectSerializer/Include/Container/SSet.h
diff --git a/ObjectSerializer/Include/Container/SVector.h b/ObjectSerializer/Include/Container/SVector.h
diff --git a/ObjectSerializer/Include/File Manager/EXCLUDE.H b/ObjectSerializer/Include/File Manager/EXCLUDE.H